diff options
| author | Josh Blum | 2011-08-19 15:57:24 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-08-19 15:57:24 -0700 |
| commit | be41f9cce02a3955e392e02fdc5e3fe7e69e1f7e (patch) | |
| tree | fa926bf560941491bd6bb25e721b4e4554c15a2c | |
| parent | cd90f0c5252cf40309992f4ca6c2b7c8cf07508d (diff) | |
| download | gnuradio-be41f9cce02a3955e392e02fdc5e3fe7e69e1f7e.tar.gz gnuradio-be41f9cce02a3955e392e02fdc5e3fe7e69e1f7e.tar.bz2 gnuradio-be41f9cce02a3955e392e02fdc5e3fe7e69e1f7e.zip | |
gruel: removed merge junk in makefile
| -rw-r--r-- | gruel/src/include/gruel/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gruel/src/include/gruel/Makefile.am b/gruel/src/include/gruel/Makefile.am index d258f0379..fce739f08 100644 --- a/gruel/src/include/gruel/Makefile.am +++ b/gruel/src/include/gruel/Makefile.am @@ -26,8 +26,6 @@ EXTRA_DIST += inet.h.in gruelincludedir = $(prefix)/include/gruel gruelinclude_HEADERS = \ -<<<<<<< HEAD - $(BUILT_SOURCES) \ api.h \ attributes.h \ high_res_timer.h \ |