From a1dfa857a0c77b0fa635ab37130c824188a98b02 Mon Sep 17 00:00:00 2001
From: Gaurav Sinha <gaurav.sinha@vyatta.com>
Date: Thu, 15 Dec 2011 17:45:53 -0800
Subject: Fixing broken build as a result of merge

---
 Makefile.am | 3 ---
 1 file changed, 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
 
-- 
cgit v1.2.3