« get me outta code hell

hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--album/lofam2.txt1
-rw-r--r--static-pages.txt5
2 files changed, 1 insertions, 5 deletions
diff --git a/album/lofam2.txt b/album/lofam2.txt
index b4c80cb1..6e829eff 100644
--- a/album/lofam2.txt
+++ b/album/lofam2.txt
@@ -1451,7 +1451,6 @@ Track Art: Spectrumfizz
 Duration: 3:13
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/planetarium
-- https://youtu.be/0J76sysYCOE
 Commentary:
     <i>Rachel Rose Mitchell:</i>
     Planetarium was the first piece of Homestuck fan music I ever made. I'd only just caught up with the archives when I was set a composition assignment for university. Having never used Logic to compose before, I had fun playing with a bunch of the different inbuilt instruments. When I found the koto, I knew exactly what I wanted to do. I tried to make it sound somewhat ethereal and otherworldly to represent the Incipisphere in all its beautiful weirdness. To try to do that, I threw a whole lot of reverb and delay at pretty much every track. I really did not know what I was doing, but it was fun.
diff --git a/static-pages.txt b/static-pages.txt
index 3c9389d2..59d25650 100644
--- a/static-pages.txt
+++ b/static-pages.txt
@@ -110,18 +110,15 @@ Content:
     - fixed [[track:aggrieve-remix]] referencing [[track:aggrieve]] instead of [[track:aggrieve-violin-refrain]]
     - fixed [[track:white-host-green-room]] referencing [[track:the-king-in-red]] instead of [[track:the-king-in-red-beta]] (thanks, Cello!)
     - fixed [[Toby Fox Has Written Hundreds of Unique Original Songs]] referencing [[track:ruins]] (by Erik Scheele) instead of [[track:ruins-undertale]] (by Toby Fox)
-<<<<<<< Updated upstream
     - fixed a number of syntax errors in data files, thanks to improved parsing and data review by Gio (thank you!):
         - fixed transcribed artist commentary not showing up for [[track:frogsong]]
         - fixed YouTube and tumblr links not showing up for artist [[artist:first-turn-fold]]
         - fixed tumblr link not showing up for artist [[artist:thiefofstars]]
-=======
     - fixed [[La Espero]] not being listed in reference list for [[Malblanka Rozo Verda Stelo]] (thanks, Sgeo!)
         - added [[La Espero]] and artists [[artist:l-l-zamenhof]] and [[artist:flicien-menu-de-mnil]]
     - fixed incorrect capitalization for [[album:sburb-ost]]
->>>>>>> Stashed changes
     - added Bandcamp link to [[album:perfectly-generic-object]] (thanks, Leo!)
-    - replaced dead Youtube link to [[track:corridors-of-time]] (thanks, Sgeo!)
+    - replaced dead Youtube link to [[track:corridors-of-time]] and removed dead Youtube link from [[track:planetarium]] (thanks, Sgeo!)
     - directory changed for some [[album:jailbreak-vol-1]] content
     - art tags for [[album:strife]] and [[album:act-7]]'s covers
     - added art tags for some Hiveswap characters (unused except for [[tag:jude]])