From e111e1336e45c09b237d0384abd6903651bd70ff Mon Sep 17 00:00:00 2001
From: Rejeesh Kutty <rejeesh.kutty@analog.com>
Date: Fri, 6 Feb 2015 22:14:21 -0500
Subject: [PATCH] conflicts-

---
 projects/daq2/vc707/system_bd.tcl      | 1 -
 projects/daq2/vc707/system_project.tcl | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/projects/daq2/vc707/system_bd.tcl b/projects/daq2/vc707/system_bd.tcl
index 09dfb83c1..a7670209e 100644
--- a/projects/daq2/vc707/system_bd.tcl
+++ b/projects/daq2/vc707/system_bd.tcl
@@ -6,4 +6,3 @@ p_sys_dmafifo [current_bd_instance .] axi_ad9680_fifo 128 16
 
 source ../common/daq2_bd.tcl
 
-
diff --git a/projects/daq2/vc707/system_project.tcl b/projects/daq2/vc707/system_project.tcl
index e262d7363..b4d1c9907 100644
--- a/projects/daq2/vc707/system_project.tcl
+++ b/projects/daq2/vc707/system_project.tcl
@@ -1,6 +1,4 @@
 
-
-
 source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/projects/scripts/adi_project.tcl
 
@@ -17,4 +15,3 @@ set_property PROCESSING_ORDER EARLY [get_files system_constr.xdc]
 
 adi_project_run daq2_vc707
 
-