diff options
| author | root <root@krebs> | 2011-09-01 16:44:21 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 16:44:21 +0200 |
| commit | 6f2df7825a1896ac00480fcd68345629c72386ea (patch) | |
| tree | 8e9bb6153648744ef31741d35c107aa54933f4c8 /streams | |
| parent | a0f23b72769deac88e414b1cfdfdbde5882ba704 (diff) | |
| parent | 57c5c973a40bf718f99c6e0fcd65b416514e2257 (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
streams/stream.db
Diffstat (limited to 'streams')
| -rw-r--r-- | streams/stream.db | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/streams/stream.db b/streams/stream.db index 47ccf7b5..5efeb9ea 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -6,4 +6,3 @@ http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast http://stream2.jungletrain.net:8000 jungletrain http://playlist.tormentedradio.com/tormentedradio.pls tormented -http://filebitch.shack:8000 mpd |