oooohhh

cc99c478 · Cesar Prados · b8a471f1 · cc99c478
Commit cc99c478 authored Apr 02, 2014 by Cesar Prados
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

VME_CR_pack.vhd hdl/VME_CR_pack.vhd +0 -1

No files found.
--- a/hdl/VME_CR_pack.vhd
+++ b/hdl/VME_CR_pack.vhd
@@ -51,7 +51,6 @@ package VME_CR_pack is
   constant c_amcap2e : std_logic_vector(63 downto 0) :=
   --"0000000000000000000000000000000100000000000000000000000000000000"; -- for modalities TWO_edge 
   "0000000000000000000000000000000000000000000000000000000000000000";   -- disabled TWO_edge 
->>>>>>> Stashed changes
   constant c_xamcap0 : std_logic_vector(255 downto 0) :=
   (others => '0');