Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed merge issues

  • Loading branch information...
commit 1d44095eb814a3c32a2edee8056366562bfddc1c 2 parents efafca3 + ce6a1cf
@atlamillia authored
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">
Please sign in to comment.
Something went wrong with that request. Please try again.