Resolve merge

kiwix · Jan 12, 2024 · eec2496 · eec2496
1 parent bad2334
commit eec2496
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/dwds/dwds.xcassets/GenericZimFile.imageset/Contents.json b/dwds/dwds.xcassets/GenericZimFile.imageset/Contents.json
@@ -1,22 +1,8 @@
 {
   "images" : [
     {
-<<<<<<< HEAD
       "filename" : "icon_128x128.png",
       "idiom" : "universal"
-=======
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icon_128x128.png",
-      "idiom" : "universal",
-      "scale" : "3x"
->>>>>>> origin/main
     }
   ],
   "info" : {