From 4c2d2a79658195a7e2fd2949218389eb7da6ca44 Mon Sep 17 00:00:00 2001
From: Micaela Verucchi <micaelaverucchi@gmail.com>
Date: Tue, 11 Feb 2020 15:12:27 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 27d4af6..f8a3262 100644
--- a/README.md
+++ b/README.md
@@ -136,11 +136,6 @@ where
 Example:
 
 ```
-<<<<<<< HEAD
 cd build
 ./map_demo dla34_cnet.rt c ../demo/COCO_val2017/all_labels.txt ../demo/config.yaml
 ```
-=======
-./map_demo dla34_cnet.rt c path/to/labelsCOCO_val2017.txt ../demo/config.yaml
-```
->>>>>>> 6e2ff405f40e640823c1359a42aebe2d28a93820