From ef2df950520a47ca7011736648334eedeae5297a Mon Sep 17 00:00:00 2001
From: Patrick Simianer <p@simianer.de>
Date: Wed, 19 Oct 2011 20:56:22 +0200
Subject: merged, compiles but not working

---
 utils/fdict.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'utils/fdict.h')

diff --git a/utils/fdict.h b/utils/fdict.h
index 9c8d7cde..f0871b9a 100644
--- a/utils/fdict.h
+++ b/utils/fdict.h
@@ -33,7 +33,6 @@ struct FD {
     hash_ = new PerfectHashFunction(cmph_file);
 #endif
   }
->>>>>>> upstream/master
   static inline int NumFeats() {
 #ifdef HAVE_CMPH
     if (hash_) return hash_->number_of_keys();
-- 
cgit v1.2.3