From: Jim Lawson <ucbjrl@berkeley.edu>
Date: Tue, 18 Dec 2018 22:11:02 +0000 (-0800)
Subject: Fix botched merge in CHANGELOG
X-Git-Tag: yosys-0.9~116^2~13
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76696e80041dc5b8f4ba986f4f83d6e7b6854e96;p=yosys.git

Fix botched merge in CHANGELOG
---

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