From 3626ea14791a0ccf70f37166152c890ab1e3734f Mon Sep 17 00:00:00 2001 From: Michael Howard Date: Wed, 29 Apr 2026 15:12:12 +0000 Subject: [PATCH 1/2] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index fb8acb9..9857f8d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Podcast Server 🚀 A lightweight, professional-grade podcast hosting and management platform designed for churches and small organizations. Built with PHP 8 and MySQL, this system provides a seamless way to host audio content, track analytics, and engage listeners via push notifications. @@ -88,4 +87,4 @@ This project is licensed under the MIT License. # Podcast-server A lightweight, professional-grade podcast hosting and management platform designed for churches and small organizations. Built with PHP 8 and MySQL, this system provides a seamless way to host audio content, track analytics, and engage listeners via push notifications. ->>>>>>> de0edf94110f2fe94fafd5cb8cf258079f336584 + From 76ba0213c60022dac666e57ed16a36d25221eb1e Mon Sep 17 00:00:00 2001 From: Michael Howard Date: Wed, 29 Apr 2026 15:13:01 +0000 Subject: [PATCH 2/2] Add admin/index.html --- admin/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 admin/index.html diff --git a/admin/index.html b/admin/index.html new file mode 100644 index 0000000..e69de29