diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c1f28a2..34a92b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,6 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates -<<<<<<< HEAD share_perl5dir = $(datarootdir)/perl5/Vyatta -======= ->>>>>>> 7b98a85b8b777182e698d0c2c4e668fa90245555 curverdir = $(sysconfdir)/config-migrate/current modprobedir = /etc/modprobe.d |