Gel file cleanup
authorSandeep Nair <a0875039@gt48xvq51.gt.design.ti.com>
Wed, 9 Mar 2011 21:08:02 +0000 (16:08 -0500)
committerSandeep Nair <a0875039@gt48xvq51.gt.design.ti.com>
Wed, 9 Mar 2011 21:08:02 +0000 (16:08 -0500)
src/util/i2cConfig/i2cConfig.gel

index f76cd6883479ebd02aac207797f23f7640f2feca..ea807554785d7230910aa80c9abee87b347d6189 100755 (executable)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:src/util/i2cConfig/i2cConfig.gel
 #define TRUE  1
 #define FALSE 0