diff --git a/index.php b/index.php index 456525e..6504653 100644 --- a/index.php +++ b/index.php @@ -1361,13 +1361,10 @@ echo $css_adicional;
-<<<<<<< HEAD -
-
-======= +
->>>>>>> 8eca1b220dbaecbb61b41974573b70a4d8ee8bea +