diff options
| author | Josh Blum | 2011-07-29 11:25:54 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-29 11:25:54 -0700 |
| commit | 5a20a73f54a0cc07fffcdb0a259cee7e26fb0ad6 (patch) | |
| tree | f056e3931e7d27808c9d771f1abc14e81fb50f14 /gruel/src | |
| parent | 8bc1c4dc5a8d31594e8768a10e05b4b0172e733e (diff) | |
| download | gnuradio-5a20a73f54a0cc07fffcdb0a259cee7e26fb0ad6.tar.gz gnuradio-5a20a73f54a0cc07fffcdb0a259cee7e26fb0ad6.tar.bz2 gnuradio-5a20a73f54a0cc07fffcdb0a259cee7e26fb0ad6.zip | |
gruel: fix for merge conflict verbose that got saved
Diffstat (limited to 'gruel/src')
| -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 \ |