rebase artifacts (squash me later)

fritsch · Feb 3, 2016 · 09f28f3 · 09f28f3
1 parent ec3215a
commit 09f28f3
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tools/mkpkg/mkpkg_binary-addons b/tools/mkpkg/mkpkg_binary-addons
@@ -97,7 +97,6 @@ if [ ! -d $KODI_DIR ] ; then
   exit 127
 fi
 
-<<<<<<< HEAD
 # platform
 REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $2}')
 GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $3}')