diff options
| author | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
| commit | 452b42326167b97081bc386dbb8fd800075d1269 (patch) | |
| tree | ca14573e065748fe6a2aad5a096c2d713e0c6e39 /build.gradle | |
| parent | dc4e74975afcba8a694ec23666c538dc761277b1 (diff) | |
| parent | 117ec679f83e67762552e2c16310a1f57a9b9d88 (diff) | |
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index fc522b2a..16995417 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { - mavenCentral() - jcenter() maven { url 'https://maven.google.com/' name 'Google' } + mavenCentral() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' @@ -18,11 +18,11 @@ plugins { allprojects { repositories { - mavenCentral() - jcenter() maven { url 'https://maven.google.com/' name 'Google' } + mavenCentral() + jcenter() } } |