From f9b3fd53a8e5bef03e28d01ddfc40146c50133e9 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Fri, 22 Dec 2017 11:40:49 +1100
Subject: [PATCH] Merge

---
 src/apps.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index 3a1ff37f2..2e582c11b 100644
--- 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",