diff options
| -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 \ |