Merge remote-tracking branch 'origin/master' into pim_lib_work2

[mirror_frr.git] / pimd / pim_iface.c

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 0b5c7cc1eb5dffa237a4d340cd697f8abd5a74aa..7b2c7e2e93e6aab794d391c50f4c1b32f3f0c3da 100644 (file)
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -15,7 +15,10 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
+<<<<<<< HEAD
   
+=======
+>>>>>>> origin/master
 */
 
 #include <zebra.h>