@@ -171,7 +171,3 @@ if (! function_exists('dateUstoFr')) {
}
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
