1 files changed, 0 insertions, 1 deletions
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();