From ffd0c1f136444684486aed0ed76c3ccbabf41632 Mon Sep 17 00:00:00 2001
From: noah <noah@theschricks.com>
Date: Thu, 23 Sep 2021 14:09:11 -0500
Subject: [PATCH] fixed README

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index bccc3c8..c65fcf1 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ag_gen: Attack Graph Generation System
 
 ## Installation