summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjob_portal.module1
1 files changed, 0 insertions, 1 deletions
diff --git a/job_portal.module b/job_portal.module
index edad87d..58f2c2f 100755
--- a/job_portal.module
+++ b/job_portal.module
@@ -1,5 +1,4 @@
<?php
-<<<<<<< HEAD
/* hook menu */
function job_portal_menu()
{