From 20d332d02b7ddce5e8a44be554164b0f0c1c44e6 Mon Sep 17 00:00:00 2001
From: Okhin <okhin@okhin.fr>
Date: Thu, 22 Nov 2018 18:19:11 +0100
Subject: [PATCH] WIP

---
 app/MessageHelper.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/MessageHelper.php b/app/MessageHelper.php
index 5d72af8..a7cba4e 100644
--- a/app/MessageHelper.php
+++ b/app/MessageHelper.php
@@ -1,10 +1,6 @@
 <?php
 
-<<<<<<< HEAD
-class MessageHelper extends \Prefab
-=======
 class MessageHelper
->>>>>>> Let's start a Message class
 {
     /**
      * Cette classe sert à afficher le code HTML stocké dans un tableau passé en argument
-- 
2.21.0