From 7c02e67fb18dd1154e3cf4b25ebfdcea556f3007 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@unidata.ucar.edu>
Date: Mon, 10 Mar 2014 12:46:05 -0600
Subject: [PATCH] Removed stray 'conflict resolution' information.

---
 cf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cf b/cf
index 6457dc5fa..cf7a4a8c3 100644
--- a/cf
+++ b/cf
@@ -19,10 +19,7 @@ DAP=1
 CFLAGS=""
 #CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter -Wconversion ${CFLAGS}"
 #CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter ${CFLAGS}"
-<<<<<<< HEAD
 #CFLAGS="-Wconversion"
-=======
->>>>>>> 513cb29ea4eb4e1087c9dbcdf3471e08c741fb2b
 
 FORCE="-i"