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