From 92fdf6ab255cc07091bbdb59e7eb5e57553115ba Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Tue, 5 Oct 2010 11:53:43 -0700
Subject: U2P: 32/64Mbit FLASH support, internal reference support for U2P r2

---
 host/lib/ic_reg_maps/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'host/lib/ic_reg_maps')

diff --git a/host/lib/ic_reg_maps/CMakeLists.txt b/host/lib/ic_reg_maps/CMakeLists.txt
index 507f214c9..772166334 100644
--- a/host/lib/ic_reg_maps/CMakeLists.txt
+++ b/host/lib/ic_reg_maps/CMakeLists.txt
@@ -70,11 +70,11 @@ LIBUHD_PYTHON_GEN_SOURCE(
 )
 
 LIBUHD_PYTHON_GEN_SOURCE(
-<<<<<<< HEAD
     ${CMAKE_SOURCE_DIR}/lib/ic_reg_maps/gen_ads62p44_regs.py
     ${CMAKE_BINARY_DIR}/lib/ic_reg_maps/ads62p44_regs.hpp
-=======
+    )
+
+LIBUHD_PYTHON_GEN_SOURCE(
     ${CMAKE_SOURCE_DIR}/lib/ic_reg_maps/gen_tuner_4937di5_regs.py
     ${CMAKE_BINARY_DIR}/lib/ic_reg_maps/tuner_4937di5_regs.hpp
->>>>>>> bd3bd0dfbc1a87af5839c9b23450434cfb9c763c
 )
-- 
cgit v1.2.3