Merge branch 'master' of https://github.com/matteopic/dbmanager.git

Conflicts: ftl/mysql-resources.ftl
matteopic · Dec 22, 2014 · 4508221 · 4508221
2 parents 81cfc7f + a5c1ec2
commit 4508221
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ftl/mysql-resources.ftl b/ftl/mysql-resources.ftl
@@ -22,7 +22,7 @@
 <#if Uptime?number?long gt 172800>
   Server has been running for over 48hrs.<br/>
   It should be safe to follow these recommendations
-<#else>
+<#else>
 	<span class="danger">
 		Warning:<br/>
 		Server has not been running for at least 48hrs.<br/>