Home Explore Help
Sign In
KarmaSolutions
/
KarmaFW
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

conflit

Max YO 6 years ago
parent
07c6dbd8a5
commit
cd6baba8f9
1 changed files with 3 additions and 0 deletions
Split View Show Diff Stats
  1. 3 0
      helpers/helpers_default.php

+ 3 - 0
helpers/helpers_default.php
View File 

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