From 969548f9e69cad0a3c30ba56d42eddf701e5678d Mon Sep 17 00:00:00 2001 From: Brian O'Reilly Date: Tue, 30 Sep 2025 20:41:25 -0400 Subject: [PATCH] repair merge conflict chaff after the fact. --- template/front-page.chtml | 74 --------------------------------------- template/login.chtml | 44 ----------------------- 2 files changed, 118 deletions(-) diff --git a/template/front-page.chtml b/template/front-page.chtml index ef22c3b..4754e5f 100644 --- a/template/front-page.chtml +++ b/template/front-page.chtml @@ -8,7 +8,6 @@
-<<<<<<< HEAD

🎵 ASTEROID RADIO 🎵

-||||||| f4a3987 -

🎵 ASTEROID RADIO 🎵

-
-

Station Status

-

🟢 LIVE - Broadcasting asteroid music for hackers

-

Current listeners: 0

-

Stream quality: 128kbps MP3

-
-
- Admin Dashboard - Web Player - 🎵 Live Stream - API Status -
- -
-

🔴 LIVE STREAM

-

Stream URL: http://localhost:8000/asteroid.mp3

-

Format: MP3 128kbps Stereo

-

Status: ● BROADCASTING

- -
-
-

Now Playing

-

Artist: The Void

-

Track: Silence

-

Album: Startup Sounds

-

Duration: ∞

-
-======= -
-

🎵 ASTEROID RADIO 🎵

- -
- -
-
-

Station Status

-

🟢 LIVE - Broadcasting asteroid music for hackers

-

Current listeners: 0

-

Stream quality: 128kbps MP3

-
- -
-

🔴 LIVE STREAM

-

Stream URL: http://localhost:8000/asteroid.mp3

-

Format: MP3 128kbps Stereo

-

Status: ● BROADCASTING

- -
- -
-

Now Playing

-

Artist: The Void

-

Track: Silence

-

Album: Startup Sounds

-

Duration: ∞

-
-
->>>>>>> SystemConfiguration diff --git a/template/login.chtml b/template/login.chtml index e4344c5..ef45cd1 100644 --- a/template/login.chtml +++ b/template/login.chtml @@ -1,4 +1,3 @@ -<<<<<<< HEAD @@ -39,46 +38,3 @@ -||||||| f4a3987 -======= - - - - Asteroid Radio - Login - - - - - -
-

🎵 ASTEROID RADIO - LOGIN

-
-
-

System Access

-
- Invalid username or password -
-
-
- - -
-
- - -
-
- -
-
-
- Default Admin Credentials:
- Username: admin
- Password: asteroid123 -
-
-
-
- - ->>>>>>> SystemConfiguration