last

manifest.json

@@ -14,7 +14,7 @@
                         "^/api" : ""
                     }
                 }
-<<<<<<< HEAD
+// <<<<<<< HEAD
             },
             "https" : false
         },
@@ -23,13 +23,13 @@
         },
         "template" : "index.html",
         "title" : "DayDayU 日日學｜香港線上學習平台"
-=======
+// =======
             }
         },
         "router" : {
             "base" : "./"
         }
->>>>>>> e2314e8e37337ca741c4233b38686a5a1277ebe5
+// >>>>>>> e2314e8e37337ca741c4233b38686a5a1277ebe5
     },
     "description" : "",
     "versionName" : "1.0.0",