Resolve merge conflict

This commit is contained in:
Job Snijders
2019-12-22 17:15:05 +01:00
parent 03e3b11d95
commit a931b9d12b
3 changed files with 11 additions and 10 deletions

View File

@@ -3,7 +3,8 @@ bin_PROGRAMS=bgpq4
bgpq4_SOURCES=bgpq4.c sx_report.c bgpq_expander.c sx_slentry.c \
bgpq4_printer.c sx_prefix.c strlcpy.c sx_maxsockbuf.c \
bgpq4.h config.h sx_maxsockbuf.h sx_prefix.h \
sx_report.h sx_slentry.h sys_queue.h sys_tree.h
sx_report.h sx_slentry.h sys_queue.h sys_tree.h \
expander_freeall.c
dist_doc_DATA=bgpq4.html
dist_man8_MANS=bgpq4.8
EXTRA_DIST=bootstrap readme.header README.md CHANGES COPYRIGHT bgpq4.spec