From 72c5f63876d3832c16091efb0f6e4ff30584f8f2 Mon Sep 17 00:00:00 2001
From: minhdb <mail@minhdb.io>
Date: Tue, 17 Jan 2023 11:07:32 +0700
Subject: [PATCH] Fixed typos in README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 7e3b1f1..0b6770b 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,7 @@
 ## Description
 Paint toy project to draw shapes. More practice on design patterns. 
 
-<<<<<<< HEAD
 <img src="https://i.imgur.com/kzzao6g.png" width=50% height=50%>
-=======
-![JPaint](https://i.imgur.com/kzzao6g.png){width=50%, height:50%}
->>>>>>> 26b1e277880e38dfe6cc63314c06189fa552531c
 
 ## How to run the code locally