got conflict with branch b5

last worked in weather API
change
2024-02-19 12:27:05 +00:00 · 2024-02-17 07:38:29 +00:00 · 2024-02-16 16:31:31 +00:00 · 2024-02-16 12:38:40 +00:00 · 2024-02-16 12:34:55 +00:00 · 2024-02-16 08:42:16 +00:00
1 changed files with 2 additions and 5 deletions
--- a/src/pages/editor/add-news.astro
+++ b/src/pages/editor/add-news.astro
@@ -1,11 +1,8 @@
 ---
 import Layout from "../../layouts/Layout.astro";
-<<<<<<< HEAD
+// import ImageUpload from "../components/ImageUpload.vue";
 // import ImageUpload from "../../components/ImageUpload.vue";
 =======
 import ImageUpload from "../../components/ImageUpload.vue";
 import AdminHeader from "../../components/AdminHeader.astro";
->>>>>>> 12c6a9584cafd2ce5d3772aaeda8d233469379f8
+
 ---
 <Layout title="Add News | Barta India">
Author	SHA1	Message	Date
dev sp	2d6e51ff9d	got conflict with branch b5	2024-02-19 12:27:05 +00:00
dev sp	12c6a9584c	last worked in weather API	2024-02-17 07:38:29 +00:00
dev sp	10e2829ced	change	2024-02-16 16:31:31 +00:00
dev sp	90a2fe8d9b	change	2024-02-16 12:38:40 +00:00
dev sp	136ceab9b6	add language pages	2024-02-16 12:34:55 +00:00
dev sp	c06befa343	add dyanamic category pages	2024-02-16 08:42:16 +00:00
dev sp	00a1640ff5	change	2024-02-15 16:04:35 +00:00
dev sp	abb1200c95	single file upload page	2024-02-15 15:53:27 +00:00
dev sp	74973dfc1e	change file upload	2024-02-13 16:11:16 +00:00
dev sp	ae8f0c0b77	add file upload	2024-02-12 12:00:22 +00:00
dev sp	5d2a3f552e	b5	2024-02-09 15:22:02 +00:00
dev sp	d920cba449	resolve chors issue in production server	2024-02-09 11:21:41 +00:00
dev sp	629a1fba25	chamge	2024-02-09 05:59:06 +00:00