resolve merge

7 years ago · 2e3be27278
parent dcf5719eaf 5c07eac4de
commit 2e3be27278
2 changed files with 4 additions and 5 deletions
--- a/www/todo/example/index.html
+++ b/www/todo/example/index.html
@ -2,7 +2,7 @@
 <html lang="en" data-framework="javascript">
 	<head>
 		<meta charset="utf-8">
-		<title>VanillaJS • TodoMVC</title>
+		<title>Crypt Todo</title>
 		<link rel="stylesheet" href="assets/todomvc-common/base.css">
 		<link rel="stylesheet" href="assets/todomvc-app-css/index.css">
 	</head>
@ -34,10 +34,7 @@
 			</footer>
 		</section>
 		<footer class="info">
-			<p>Double-click to edit a todo</p>
-			<p>Created by <a href="http://twitter.com/oscargodson">Oscar Godson</a></p>
-			<p>Refactored by <a href="https://github.com/cburgmer">Christoph Burgmer</a></p>
-			<p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
+			
 		</footer>
 		<script src="assets/todomvc-common/base.js"></script>
 		<script src="js/helpers.js"></script>
@ -49,3 +46,4 @@
 		<script src="js/app.js"></script>
 	</body>
 </html>
+
--- a/www/todo/index.html
+++ b/www/todo/index.html
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html class="cp pad">
 <head>