Skip to content

Commit 652a1d2

Browse files
atorralbaatorralba
committed
Fix wrongly resolved rebase conflicts
1 parent 5cf6644 commit 652a1d2

File tree

4 files changed

+0
-4
lines changed

4 files changed

+0
-4
lines changed

‎java/ql/test/stubs/google-android-9.0.0/android/content/Context.java‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/ql/test/stubs/google-android-9.0.0/android/content/Intent.java‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/ql/test/stubs/google-android-9.0.0/android/database/sqlite/SQLiteDatabase.java‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/ql/test/stubs/google-android-9.0.0/android/os/Bundle.java‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)