diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-15 17:45:53 -0800 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-15 17:45:53 -0800 |
| commit | a1dfa857a0c77b0fa635ab37130c824188a98b02 (patch) | |
| tree | f73f224abc475aeb9b9c6aaa261411dedb92260f /Makefile.am | |
| parent | c9c00eef81dcb5b9fecd3f2b5f7e2c0c80c6168d (diff) | |
| download | vyatta-conntrack-a1dfa857a0c77b0fa635ab37130c824188a98b02.tar.gz vyatta-conntrack-a1dfa857a0c77b0fa635ab37130c824188a98b02.zip | |
Fixing broken build as a result of merge
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 |