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

[mirror_frr.git] / pimd / pim_ssmpingd.c

diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index 00abc5f60af8e00549811263a07ccaf50db4c93e..e443a92d614800c35a283c19cd153dc69573c8c5 100644 (file)
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -16,7 +16,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>