From fbf7dbff39046f27252301c34003d9d7736d3dcd Mon Sep 17 00:00:00 2001
From: Emile <git@emile.space>
Date: Mon, 30 May 2022 22:20:58 +0200
Subject: install instructions (fixed rebase fuckup)

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

(limited to 'README.md')

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)
-- 
cgit 1.4.1