Permalink
Browse files

resolving conflict

  • Loading branch information...
2 parents dd4a75e + 042e91d commit f56c8c342b08b3108def52a78ec36becf50b8807 @lukas-vlcek lukas-vlcek committed Mar 23, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 index.html
View
@@ -120,4 +120,4 @@
</div>
</div>
</body>
-</html>
+</html>

0 comments on commit f56c8c3

Please sign in to comment.