Update index.php

fix strange commit conflict
agentcobra · Feb 8, 2015 · e2e1146 · e2e1146
1 parent 3a3a60f
commit e2e1146
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/index.php b/index.php
@@ -22,16 +22,9 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 // EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-<<<<<<< HEAD
 require_once("config.inc.php");
 require_once("utils.inc.php");
 require_once("poparse.inc.php");
-=======
-require_once("config.inc");
-require_once("utils.inc");
-require_once("poparse.inc");
->>>>>>> f1b91f1b9c398ef4fc57892275adb631b9d972bd
 
 forceNoCache();
 ?>