Merge branch 'master' of https://github.com/cahyadsn/wilayah

cahyadsn · Dec 20, 2024 · 7359b1e · 7359b1e
2 parents 957e4df + 7de3929
commit 7359b1e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/apps/inc/geo_ajax.php b/apps/inc/geo_ajax.php
@@ -5,7 +5,11 @@
 filename : geo_ajax.php
 purpose  :
 create   : 170912
+<<<<<<< HEAD
 last edit: 2024-12-19 10:31:03
+=======
+last edit: 2024-12-19 10:35:03
+>>>>>>> 7de39290e2d601d2468ca5dd0a6a65abfa0a85f2
 author   : cahya dsn
 ================================================================================
 This program is free software; you can redistribute it and/or modify it under the