fixed conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/decoder/cdec.cc b/decoder/cdec.cc
index 4819105c..cc3fcff1 100644
--- a/decoder/cdec.cc
+++ b/decoder/cdec.cc
@@ -5,6 +5,7 @@
 #include "ff_register.h"
 #include "verbose.h"
 #include "timing_stats.h"
+#include "util/usage.hh"
 
 using namespace std;
 
@@ -40,6 +41,7 @@ int main(int argc, char** argv) {
       cout << FD::Convert(i) << endl;
     }
   }
+  util::PrintUsage(std::cerr);
   return 0;
 }