..

.gitignore

-# ??git
 *.patch
 *~
 *.o
@@ -25,12 +24,7 @@ autom4te.cache/*
 autom4te.cache
 config.log
 config.status
-<<<<<<< HEAD
 pub/*/.deps
 pub/*/.libs
-=======
-pub/*/.deps/*
-pub/*/.libs/*
->>>>>>> cba91ba3602b321fa6b671046e6be62f143b8285
 demo/lm_test
 libtool