resolved merge conflict

internalG · May 30, 2012 · 2833ac5 · 2833ac5
1 parent be3e939
commit 2833ac5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/build-droid/build-libgcrypt.sh b/build-droid/build-libgcrypt.sh
@@ -34,11 +34,7 @@ fi
 
 # Extract source
 rm -rf "libgcrypt-${LIBGCRYPT_VERSION}"
-<<<<<<< HEAD
 tar xvjf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
-=======
-tar xvf "libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
->>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgcrypt-${LIBGCRYPT_VERSION}"

diff --git a/build-droid/build-libgpg-error.sh b/build-droid/build-libgpg-error.sh
@@ -34,11 +34,7 @@ fi
 
 # Extract source
 rm -rf "libgpg-error-${LIBGPG_ERROR_VERSION}"
-<<<<<<< HEAD
 tar xvjf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
-=======
-tar xvf "libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2"
->>>>>>> removed invalid option 'z' passed to tar command
 
 # Build
 pushd "libgpg-error-${LIBGPG_ERROR_VERSION}"