HTML/FlexyFramework2.php

diff --git a/HTML/FlexyFramework2.php b/HTML/FlexyFramework2.php
index af75ea6..400e601 100644 (file)
--- a/HTML/FlexyFramework2.php
+++ b/HTML/FlexyFramework2.php
@@ -1407,9 +1407,4 @@ class HTML_FlexyFramework2 {
         exit;
     }    
 }
-<<<<<<< HEAD
-
-
- 
-=======
->>>>>>> 490dbc58ad283821dbcf099e64722a0fa168e41d
+ 
\ No newline at end of file