aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Lawson <ucbjrl@berkeley.edu>2018-12-18 14:11:02 -0800
committerJim Lawson <ucbjrl@berkeley.edu>2018-12-18 14:11:02 -0800
commit76696e80041dc5b8f4ba986f4f83d6e7b6854e96 (patch)
tree613ccca3d1cfad1d36886867cdf8dfd7ed235347
parentf4d500f98e0e298a98099ec2177b43571e9cda61 (diff)
downloadyosys-76696e80041dc5b8f4ba986f4f83d6e7b6854e96.tar.gz
yosys-76696e80041dc5b8f4ba986f4f83d6e7b6854e96.tar.bz2
yosys-76696e80041dc5b8f4ba986f4f83d6e7b6854e96.zip
Fix botched merge in CHANGELOG
-rw-r--r--CHANGELOG1
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
----------------------