diff options
Diffstat (limited to 'pimd/pim_str.c')
| -rw-r--r-- | pimd/pim_str.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pimd/pim_str.c b/pimd/pim_str.c index 5144031794..7f814fcda8 100644 --- a/pimd/pim_str.c +++ b/pimd/pim_str.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> |