diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /build.gradle | |
parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) |
solved merge conflict
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() } } |