From 6e518bd8a156af0747cfd85329199a69e62c4337 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 29 Aug 2019 00:33:30 +0100
Subject: [PATCH] Fix syntax error left behind by git

---
 module_index.json | 24 ++++++++++++------------
 pack.php          |  3 ---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/module_index.json b/module_index.json
index f468cb1..8467d5d 100755
--- a/module_index.json
+++ b/module_index.json
@@ -75,7 +75,7 @@
         "version": "0.1",
         "author": "Starbeamrainbowlabs",
         "description": "Displays a special page to aid in setting up a new wiki for the first time.",
-        "lastupdate": 1557611471,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -85,7 +85,7 @@
         "version": "0.1.4",
         "author": "Starbeamrainbowlabs",
         "description": "The module everyone has been waiting for! Adds a web based gui that lets mods change the wiki settings.",
-        "lastupdate": 1557575008,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -95,7 +95,7 @@
         "version": "0.4.2",
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to keep unlimited page history, limited only by your disk space. Note that this doesn't store file history (yet). Currently depends on feature-recent-changes for rendering of the history page.",
-        "lastupdate": 1559400114,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -135,7 +135,7 @@
         "version": "0.7.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
-        "lastupdate": 1557653831,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -145,7 +145,7 @@
         "version": "0.2",
         "author": "Starbeamrainbowlabs",
         "description": "An extensible statistics calculation system. Comes with a range of built-in statistics, but can be extended by other modules too.",
-        "lastupdate": 1530614499,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -155,7 +155,7 @@
         "version": "0.6",
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
-        "lastupdate": 1559421090,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -165,7 +165,7 @@
         "version": "0.3.3",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a user preferences page, letting people do things like change their email address and password.",
-        "lastupdate": 1526035213,
+        "lastupdate": 1566671167,
         "optional": false,
         "extra_data": []
     },
@@ -205,7 +205,7 @@
         "version": "0.10.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds an action to allow administrators to delete pages.",
-        "lastupdate": 1559400151,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -215,7 +215,7 @@
         "version": "0.17.4",
         "author": "Starbeamrainbowlabs",
         "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
-        "lastupdate": 1559400186,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": {
             "diff.min.js": "https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/jsdiff\/2.2.2\/diff.min.js"
@@ -237,7 +237,7 @@
         "version": "0.9.3",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a rather useful help page. Access through the 'help' action. This module also exposes help content added to Pepperminty Wiki's inbuilt invisible help section system.",
-        "lastupdate": 1492433537,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -247,7 +247,7 @@
         "version": "0.11.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds a page that lists all the pages in the index along with their metadata.",
-        "lastupdate": 1557182882,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": []
     },
@@ -327,7 +327,7 @@
         "version": "0.10",
         "author": "Emanuil Rusev & Starbeamrainbowlabs",
         "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.",
-        "lastupdate": 1551564416,
+        "lastupdate": 1567034840,
         "optional": false,
         "extra_data": {
             "Parsedown.php": "https:\/\/raw.githubusercontent.com\/erusev\/parsedown\/819c68899d593503180ed79ef4be5a4dcd8c5f92\/Parsedown.php",
diff --git a/pack.php b/pack.php
index 5d7b55b..1e39cf2 100644
--- a/pack.php
+++ b/pack.php
@@ -1,7 +1,5 @@
 <?php
 
-<<<<<<< HEAD
-=======
 $paths = new stdClass();
 $paths->extra_data_directory = "._extra_data";
 
@@ -13,7 +11,6 @@ if(isset($_GET["determine-latest-version"])) {
 	]));
 }
 
->>>>>>> 24d15b1... Hotfix: Patch download packer, which was inadvertently broken
 /**
  * Logs a string to stdout, but only on the CLI.
  * @param  string $line The line to log.