From 7c7c1454302b4ad7fdb3004b6f30801ff9f02425 Mon Sep 17 00:00:00 2001
From: Christopher Fremond <34804391+Frenchris@users.noreply.github.com>
Date: Tue, 18 Jun 2019 17:15:55 +0100
Subject: [PATCH] Update collatzcountdown.en.md

---
 subjects/collatzcountdown.en.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/subjects/collatzcountdown.en.md b/subjects/collatzcountdown.en.md
index de961210..7f92e303 100644
--- a/subjects/collatzcountdown.en.md
+++ b/subjects/collatzcountdown.en.md
@@ -33,15 +33,8 @@ func main() {
 And its output :
 
 ```console
-<<<<<<< HEAD
-student@ubuntu:~/student/test$ go build
-student@ubuntu:~/student/test$ ./test
-10
-student@ubuntu:~/student/test$
-=======
 student@ubuntu:~/piscine/test$ go build
 student@ubuntu:~/piscine/test$ ./test
 10
 student@ubuntu:~/piscine/test$
->>>>>>> 3fe258c999f5918c6b750a6cbe511a7874883d25
 ```