merge conflict

Change-Id: I2fc1f6bee9e1131daefd1183e81e82fcc1e276c3
thesandlord · Oct 30, 2015 · f3636d7 · f3636d7
2 parents a0d2349 + 6bf7bc6
commit f3636d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/index.php b/index.php
@@ -101,5 +101,5 @@
 		</script>
 
 	</body>
-	<footer>powered by <a href="https://github.com/thesandlord/SlackEngine" target="_blank">App Engine</a></footer>
-</html>
+	<footer><a href="https://github.com/thesandlord/SlackEngine">SlackEngine</a>, powered by <a href="https://cloud.google.com/appengine/" target="_blank">App Engine</a></footer>
+</html>