about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--README.md4
1 files changed, 1 insertions, 3 deletions
diff --git a/README.md b/README.md
index d884b19..42e05f1 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,8 @@
 
 visualizing CTF clusters (teams playing together at DEFCON quals 2022)
 
-<<<<<<< HEAD
 <img src="./teams.svg"></img>
-=======
+
 ## building
 
 Install graphviz with the package manager of your choice.
@@ -12,4 +11,3 @@ Install graphviz with the package manager of your choice.
 ```
 neato -Tsvg teams.dot > teams.svg
 ```
->>>>>>> 6e08e33 (build instructions)