From 76696e80041dc5b8f4ba986f4f83d6e7b6854e96 Mon Sep 17 00:00:00 2001
From: Jim Lawson <ucbjrl@berkeley.edu>
Date: Tue, 18 Dec 2018 14:11:02 -0800
Subject: [PATCH] Fix botched merge in CHANGELOG

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

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
 ----------------------
 
-- 
2.30.2