hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrongly resolved rebase conflicts

Browse Source
This commit is contained in:
Tony Torralba
2022-01-17 12:09:18 +01:00
parent 5cf664411b
commit 652a1d2dc2
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/ql/test/stubs/google-android-9.0.0/android/content/Context.java generated
View File

@@ -101,7 +101,6 @@ abstract public class Context
public abstract String getSystemServiceName(Class<? extends Object> p0);
public abstract String[] databaseList();
public abstract String[] fileList();
<<<<<<< HEAD
public abstract boolean bindService(Intent p0, ServiceConnection p1, int p2);
public abstract boolean bindServiceAsUser(Intent p0, ServiceConnection p1, int p2, UserHandle p3);
public abstract boolean deleteDatabase(String p0);

1
java/ql/test/stubs/google-android-9.0.0/android/content/Intent.java generated
View File

@@ -15,7 +15,6 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
<<<<<<< HEAD
import android.util.AttributeSet;
import java.io.Serializable;
import java.util.ArrayList;

1
java/ql/test/stubs/google-android-9.0.0/android/database/sqlite/SQLiteDatabase.java generated
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
// Generated automatically from android.database.sqlite.SQLiteDatabase for testing purposes
package android.database.sqlite;

1
java/ql/test/stubs/google-android-9.0.0/android/os/Bundle.java generated
View File

@@ -12,7 +12,6 @@ import android.util.SizeF;
import android.util.SparseArray;
import java.io.Serializable;
import java.util.ArrayList;
<<<<<<< HEAD
public class Bundle extends BaseBundle implements Cloneable, Parcelable
{