Skip to content

Commit

Permalink
asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregaubs
gregaubs committed Jan 28, 2015
1 parent b1adb51 commit 6033100
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1> Demo Merge Conflicts </h1>
Greg and Amil asdlfsdddfsd
</p>

<p> Amil Amil Amil </p>
<p> Amil Amil GREG </p>

<p>
askfjsdfklsajklfdjfklsdjfsdlkjsdfklsdjklsjadklfjklasdjfklasdfjsdklfjdklafjdklfsadjfklsdjksldj Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
Expand Down

0 comments on commit 6033100

Please sign in to comment.