From d5f0b73fd9ff3a5d015faf566adcebdc29bab2b2 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 7 Jun 2019 17:00:36 -0700
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 149443c74..c1b548aeb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,12 +16,10 @@ Yosys 0.8 .. Yosys 0.8-dev
     - Added "gate2lut.v" techmap rule
     - Added "rename -src"
     - Added "equiv_opt" pass
-<<<<<<< HEAD
-    - Added "muxpack" pass
-=======
     - Added "read_aiger" frontend
->>>>>>> origin/master
+    - Added "muxpack" pass
     - "synth_xilinx" to now infer hard shift registers, using new "shregmap -tech xilinx"
+    - "synth_xilinx" to now infer wide multiplexers
 
 
 Yosys 0.7 .. Yosys 0.8
-- 
2.30.2