commit

manrajgrover · Jun 28, 2016 · 18ee529 · 18ee529
1 parent 72c4e46
commit 18ee529
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -49,9 +49,7 @@ Please go through the [Contributions](https://github.com/ManrajGrover/SingleDivP
 | [Bangladesh](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Bangladesh.html) | [ManrajGrover](https://github.com/ManrajGrover) | ![Bangladesh](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Bangladesh.png) |
 | [Belgium](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Belgium.html) | [AndyMathys](https://github.com/AndyMathys) | ![Belgium](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Belgium.png) |
 | [Bulgaria](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Bulgaria.html) | [ManrajGrover](https://github.com/ManrajGrover) | ![Bulgaria](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Bulgaria.png) |
-<<<<<<< HEAD
 | [Chile](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/chile.html) | [adavis46](https://github.com/adavis46) | ![Chile](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/chile.PNG) |
-=======
 | [Canada](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Canada.html) | [Scott Kaye](https://github.com/ScottKaye) | ![Canada](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Canada.png) |
 | [Cameroon](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Cameroon.html) | [1forh](https://github.com/1forh) | ![Cameroon](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Cameroon.png) |
 | [Colombia](https://github.com/ManrajGrover/SingleDivProject/blob/master/Flags/Colombia.html) | [DHernandex](https://github.com/dhernandex) | ![Colombia](https://github.com/ManrajGrover/SingleDivProject/blob/master/Assets/Colombia.png)