sovware · Armanul46 · Jul 9, 2026 · Jul 5, 2026 · Jul 5, 2026 · Jul 6, 2026
diff --git a/assets/build/css/admin/main.css b/assets/build/css/admin/main.css
diff --git a/assets/build/css/admin/main.rtl.css b/assets/build/css/admin/main.rtl.css
diff --git a/assets/build/css/public/main.css b/assets/build/css/public/main.css
diff --git a/assets/build/css/public/main.rtl.css b/assets/build/css/public/main.rtl.css
diff --git a/assets/build/js/admin/multi-directory-builder.js b/assets/build/js/admin/multi-directory-builder.js
diff --git a/assets/build/js/admin/settings-manager.js b/assets/build/js/admin/settings-manager.js
diff --git a/assets/build/js/public/all-listings.js b/assets/build/js/public/all-listings.js
diff --git a/assets/build/js/public/author-profile.js b/assets/build/js/public/author-profile.js
diff --git a/assets/build/js/public/directorist-dashboard.js b/assets/build/js/public/directorist-dashboard.js
diff --git a/assets/build/js/public/search-form.js b/assets/build/js/public/search-form.js
diff --git a/assets/build/js/public/single-listing.js b/assets/build/js/public/single-listing.js
diff --git a/assets/other/style.php b/assets/other/style.php
@@ -230,7 +230,6 @@
     }
 
     /*
-<<<<<<< HEAD
         Badge Colors
           - Badge Open
           - Badge Closed
@@ -281,8 +280,6 @@
     }
 
     /*
-=======
->>>>>>> 769a30930b25aabc1ebc089c6bef986b161e156b
         Change default primary dark background
     */
     .ads-advanced .price-frequency .pf-btn input:checked+span,