zygo: config: fix conflict markers

(cherry picked from commit de8fcfd2c6252fd63a095e69234c0a73f1fa9abc)

diff --git a/.config b/.config
index c88f33955329747b21a21b8e922c2c5ed02def75..199d9ca8dd5ffd16eb02014d964134f58c65521a 100644 (file)
--- a/.config
+++ b/.config
@@ -2585,12 +2585,9 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
-<<<<<<< HEAD
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
-=======
 CONFIG_BLK_DEV_LOOP=y
->>>>>>> 0d72aad8fdc8 (zygo: config: build in loop dev)
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m