Skip to content
Browse files

Fixed merge issues

  • Loading branch information...
2 parents efafca3 + ce6a1cf commit 1d44095eb814a3c32a2edee8056366562bfddc1c @atlamillia committed May 11, 2012
Showing with 3 additions and 0 deletions.
  1. +2 −0 README.md
  2. +1 −0 index.html
View
2 README.md
@@ -0,0 +1,2 @@
+atlamillia.github.com
+=====================
View
1 index.html
@@ -1,4 +1,5 @@
<html>
+<<<<<<< HEAD
<head>
<title>atlamillia</title>
<link rel="stylesheet" href="css/style.css">

0 comments on commit 1d44095

Please sign in to comment.
Something went wrong with that request. Please try again.