diff options
Diffstat (limited to 'pimd/pim_pim.h')
| -rw-r--r-- | pimd/pim_pim.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h index 1f7e1e5d4f..00c5f9012e 100644 --- a/pimd/pim_pim.h +++ b/pimd/pim_pim.h @@ -16,10 +16,6 @@ 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 */ #ifndef PIM_PIM_H |