Merge

7 years ago · f9b3fd53a8
parent 33c53bd639
commit f9b3fd53a8
1 changed files with 2 additions and 1 deletions
--- a/src/apps.json
+++ b/src/apps.json
@ -838,6 +838,7 @@
      "cats": [
        "47"
      ],
+<<<<<<< HEAD
      "headers": {
        "Set-cookie": "FESESSIONID"
      },
@ -3776,7 +3777,7 @@
      "js": {
        "Hammer": "",
        "Hammer.VERSION": "(.*)\\;version:\\1",
-        "Ha.VERSION": "(.*)\\;version:\\1"        
+        "Ha.VERSION": "(.*)\\;version:\\1"
      },
      "icon": "Hammer.js.png",
      "script": "hammer(?:\\.min)?\\.js",