« get me outta code hell

remove planetarium yt link - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
path: root/static-pages.txt
diff options
context:
space:
mode:
authorNiklink <niklink413@gmail.com>2022-01-24 00:21:27 -0400
committerNiklink <niklink413@gmail.com>2022-01-24 11:30:37 -0400
commita2f0ca3d03d62e8bb58f78f5226ce1a933fe8560 (patch)
tree8ad1630334792a6466f3cb829a607ada3511e597 /static-pages.txt
parentf069592249492e083b962770098d8b34a23d7c17 (diff)
remove planetarium yt link
fixes #18
Diffstat (limited to 'static-pages.txt')
-rw-r--r--static-pages.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/static-pages.txt b/static-pages.txt
index 3c9389d..59d2565 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]])