fixed merge conflict

Author: avscs

config.jsonc

@@ -320,6 +320,11 @@
             "aliases": [],
             "categories": []
         },
+        "Eggy Car": {
+            "path": "eggy-car",
+            "aliases": [],
+            "categories": []
+        },
         "EvoWars": {
             "path": "evowars",
             "aliases": [],

games/eggy-car/.index.html.swp

@@ -0,0 +1,28 @@
+{
+	"name": "Eggy Car",
+	"short_name": "Eggy Car",
+	"start_url": "index.html",
+	"display": "fullscreen",
+	"orientation": "landscape",
+	"icons": [{
+		"src": "icon-16.png",
+		"sizes": "16x16",
+		"type": "image/png"
+	}, {
+		"src": "icon-32.png",
+		"sizes": "32x32",
+		"type": "image/png"
+	}, {
+		"src": "icon-128.png",
+		"sizes": "128x128",
+		"type": "image/png"
+	}, {
+		"src": "icon-256.png",
+		"sizes": "144x144",
+		"type": "image/png"
+	}, {
+		"src": "icon-256.png",
+		"sizes": "256x256",
+		"type": "image/png"
+	}]
+}