From 0a950ed03485819edde72a8a34f028ea37527bf7 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 3 Nov 2016 10:26:48 +0100
Subject: [PATCH] Merge dev-settings into dev

---
 build/nntmux.xml                                              | 4 ++--
 .../db/patches/mysql/{+1~settings.sql => 0276~settings.sql}   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename resources/db/patches/mysql/{+1~settings.sql => 0276~settings.sql} (95%)

diff --git a/build/nntmux.xml b/build/nntmux.xml
index 1de9fef31..f7ef0fb5f 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,8 +16,8 @@
 			</last>
 		</scripts>
 		<sql>
-			<db>275</db>
-			<file>275</file>
+			<db>276</db>
+			<file>276</file>
 		</sql>
 	</versions>
 </nntmux>
diff --git a/resources/db/patches/mysql/+1~settings.sql b/resources/db/patches/mysql/0276~settings.sql
similarity index 95%
rename from resources/db/patches/mysql/+1~settings.sql
rename to resources/db/patches/mysql/0276~settings.sql
index a65861694..fcb1ffe46 100644
--- a/resources/db/patches/mysql/+1~settings.sql
+++ b/resources/db/patches/mysql/0276~settings.sql
@@ -8,7 +8,7 @@ UPDATE settings SET subsection = 'release' WHERE setting = 'maxsizetoformrelease
 
 UPDATE settings SET subsection = 'release' WHERE setting = 'minfilestoformrelease';
 
-UPDATE settings SET section = 'archive', subsection = 'fetch' name = 'end' WHERE setting = 'fetchlastcompressedfiles';
+UPDATE settings SET section = 'archive', subsection = 'fetch', name = 'end' WHERE setting = 'fetchlastcompressedfiles';
 
 UPDATE settings SET section = 'APIs' WHERE setting = 'amazonassociatetag';
 
@@ -136,7 +136,7 @@ UPDATE settings SET section = 'site', subsection = 'google', name = 'google_adse
 
 UPDATE settings SET section = 'site', subsection = 'google', name = 'google_analytics_acc' WHERE setting = 'google_analytics_acc';
 
-INSERT IGNORE INTO settings (section, subsection, name, value, hint, setting) VALUES (shell, date, format, '%Y-%m-%d %T', 'Format string to use in shell''s date command output. See `man date` for acceptable format.\nDefault: %Y-%m-%d %T', 'shell.date.format');
+INSERT IGNORE INTO settings (section, subsection, name, value, hint, setting) VALUES ('shell', 'date', 'format', '%Y-%m-%d %T', 'Format string to use in shell date command output. See `man date` for acceptable format.\nDefault: %Y-%m-%d %T', 'shell.date.format');