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