fixed conflict

author Cahit <c.ugur@gsi.de>

Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)

committer Cahit <c.ugur@gsi.de>

Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
author Cahit <c.ugur@gsi.de>
Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
committer Cahit <c.ugur@gsi.de>
Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
diff --cc 32PinAddOn/config.vhd
Simple merge
diff --cc 32PinAddOn/trb3_periph_32PinAddOn.vhd
Simple merge
author	Cahit <c.ugur@gsi.de>
	Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
committer	Cahit <c.ugur@gsi.de>
	Thu, 28 Jan 2016 14:28:25 +0000 (15:28 +0100)
		1	2
32PinAddOn/config.vhd	patch \|	diff1 \|	diff2 \|	blob \| history
32PinAddOn/trb3_periph_32PinAddOn.vhd	patch \|	diff1 \|	diff2 \|	blob \| history