From 572c456c7f8a0e738a990468568a7ddb37452c39 Mon Sep 17 00:00:00 2001
From: Zeeshan Ahmed <ziishaned@gmail.com>
Date: Wed, 26 Jul 2017 02:24:16 +0100
Subject: [PATCH] Fix formatting

---
 README.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e334366..c49959a 100644
--- a/README.md
+++ b/README.md
@@ -110,17 +110,10 @@ expression `[Tt]he` means: an uppercase `T` or lowercase `t`, followed by the le
 "[Tt]he" => <a href="#learn-regex"><strong>The</strong></a> car parked in <a href="#learn-regex"><strong>the</strong></a> garage.
 </pre>
 
-<<<<<<< HEAD
-Just like above example the regular expression `ge[.]` means: a lowercase character `g`, followed by letter `e`, followed by `.` character.
-
-<pre>
-"ge[.]" => The car parked in the gara<a href="#learn-regex"><strong>ge.</strong></a>
-=======
-A period inside a character set, however, means a literal period. The regular expression `ar[.]` means: a lowercase character `a`, followed by letter `r`, followed by a period.
+A period inside a character set, however, means a literal period. The regular expression `ar[.]` means: a lowercase character `a`, followed by letter `r`, followed by a period `.` character.
 
 <pre>
 "ar[.]" => A garage is a good place to park a c<a href="#learn-regex"><strong>ar.</strong></a>
->>>>>>> 7cac291415345a24a7bf1db02b6612576aab0446
 </pre>
 
 ### 2.2.1 Negated character set