diff options
Diffstat (limited to 'src/_copyright/Makefile.am')
| -rw-r--r-- | src/_copyright/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am index 33c4ffc23..edffcfc25 100644 --- a/src/_copyright/Makefile.am +++ b/src/_copyright/Makefile.am @@ -1,6 +1,9 @@ ipsec_PROGRAMS = _copyright _copyright_SOURCES = _copyright.c +<<<<<<< HEAD dist_man8_MANS = _copyright.8 +======= +>>>>>>> upstream/4.5.1 INCLUDES = \ -I$(top_srcdir)/src/libfreeswan \ |