1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5d3b9a5cb..42e01645e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,7 +18,6 @@ Yosys 0.8 .. Yosys 0.8-dev
     - Added "equiv_opt" pass
 
 
->>>>>>> upstream/master
 Yosys 0.7 .. Yosys 0.8
 ----------------------