From 2461a730a441f290912f580cf4b2f4abad1784a3 Mon Sep 17 00:00:00 2001
From: kotori0 <admin@0x.mk>
Date: Sun, 15 Nov 2020 20:34:05 +0800
Subject: [PATCH] Fix conflict not saved

---
 edxp-core/template_override/customize.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/edxp-core/template_override/customize.sh b/edxp-core/template_override/customize.sh
index aebc8fdf..0b6f9995 100644
--- a/edxp-core/template_override/customize.sh
+++ b/edxp-core/template_override/customize.sh
@@ -273,20 +273,12 @@ mv "${MODPATH}/system/framework/eddexmaker.jar" "${MODPATH}/system/framework/${J
 mv "${MODPATH}/system/framework/edconfig.jar" "${MODPATH}/system/framework/${JAR_EDCONFIG}"
 mv "${MODPATH}/system/lib/libriru_edxp.so" "${MODPATH}/system/lib/${LIB_RIRU_EDXP}"
 #mv "${MODPATH}/system/lib/libwhale.edxp.so" "${MODPATH}/system/lib/${LIB_WHALE_EDXP}"
-<<<<<<< HEAD
-#mv "${MODPATH}/system/lib/libsandhook-native.so" "${MODPATH}/system/lib/libsandhook-native.so"
-=======
 mv "${MODPATH}/system/lib/libsandhook-native.so" "${MODPATH}/system/lib/libsandhook-native.so"
->>>>>>> e43e709... Replace Whale with Dobby by adding submodule
 
 if [[ "${IS64BIT}" == true ]]; then
     mv "${MODPATH}/system/lib64/libriru_edxp.so" "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}"
     #mv "${MODPATH}/system/lib64/libwhale.edxp.so" "${MODPATH}/system/lib64/${LIB_WHALE_EDXP}"
-<<<<<<< HEAD
-    #mv "${MODPATH}/system/lib64/libsandhook-native.so" "${MODPATH}/system/lib64/libsandhook-native.so"
-=======
     mv "${MODPATH}/system/lib64/libsandhook-native.so" "${MODPATH}/system/lib64/libsandhook-native.so"
->>>>>>> e43e709... Replace Whale with Dobby by adding submodule
 fi
 
 if [[ "${VARIANTS}" == "SandHook" ]]; then