diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-04 18:53:12 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-04 18:53:12 +0100 |
| commit | 69ee1167a0b2150fd4b9165e16b7c68d9a0100dd (patch) | |
| tree | 1007656c2401d970d7e369c50272cd27ed14d203 /app/build.gradle | |
| parent | 43ac5ff987c67d61564f7b09ebacfa040f2b53b5 (diff) | |
| parent | a137eccdde9349dc52b29fdadcb44cf317465c5a (diff) | |
Merge branch 'bug/Restart-connection-if-authentication-fails-#6229' into develop
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index 9207ff84..9c1d5b4e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'android' -import org.ajoberstar.grgit.* +//import org.ajoberstar.grgit.* android { compileSdkVersion 19 @@ -58,7 +58,7 @@ def processFileInplace(file, Closure processText) { task checkoutStrippedIcsOpenVPN ( type: Copy ) { //FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream" - grgit = Grgit.open(project.file('../')) + //grgit = Grgit.open(project.file('../')) from '../../bitmask_android_tmp/ics-openvpn-stripped' into '../ics-openvpn-stripped' |