diff options
Diffstat (limited to 'pimd/pim_join.h')
| -rw-r--r-- | pimd/pim_join.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pimd/pim_join.h b/pimd/pim_join.h index fadb613592..27333243db 100644 --- a/pimd/pim_join.h +++ b/pimd/pim_join.h @@ -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 */ #ifndef PIM_JOIN_H |