Undo weird merge again

Author: m3talstorm

foe/config/foe.yml

@@ -6,13 +6,11 @@ game:
     # Update this to match the server you are playing on
     server: en1
     # Inside the 'Client-Identification' header
-    version: '1.101'
     version: '1.102'
     # This can be gotten by following this tutorial: https://github.com/m3talstorm/foe-decryption
-    secret: i+lRxG52jChsLWE3dMqO66XH0UrutcA3KRmoLt9mqjjflAO0wW9w4kbOYqfSePShqVqhNFX3aiCsvT9dEICMEw==
     secret: zIHbzMRWEvJGIfftkYOYrXk06SZnu9C7LH/RMhS7LUH/Lg2WDJ+eGuloB4HUqIUR2cyInFJyN+/CMu8+WR2CHQ==
     # The timestamp inside of the 'Referer' header: https://foeen.innogamescdn.com/swf/Preloader.swf?<here>/[[DYNAMIC]]/1
-    timestamp: 1495012914
+    timestamp: 1496048897
 
 login:
     # This is the value https://<server>.forgeofempires.com/game/json?h=<user_key> in each request