From 5651978198bc34ecd467bf6709212e570d229b85 Mon Sep 17 00:00:00 2001 From: Mathieu Nayrolles Date: Wed, 20 Apr 2016 07:17:45 -0400 Subject: [PATCH] remove empty merge conflict --- application/views/header.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/header.php b/application/views/header.php index 13149d16..4f93feca 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -123,10 +123,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 80d901c438419a7c0db002186df0935a3e9a35d3