projects / yosys.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4d500f)
Fix botched merge in CHANGELOG
authorJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:11:02 +0000 (14:11 -0800)
committerJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:11:02 +0000 (14:11 -0800)
CHANGELOG patch | blob | history

diff --git a/CHANGELOG b/CHANGELOG
index 5d3b9a5cbd3efd6ff8faedf55ef10971d9c4d24c..42e01645e4839e0ea021edd1f002c6a43ed99f72 100644 (file)
--- 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
 ----------------------