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