From 2d70848eb647e967a1bbe91618fdc87cef22aca7 Mon Sep 17 00:00:00 2001 From: Michal Pospisil Date: Tue, 31 Jan 2017 21:02:54 +0100 Subject: [PATCH 1/2] pridany roxette --- git-flow/good-music-ol.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git-flow/good-music-ol.md b/git-flow/good-music-ol.md index 3c6a020..e6a41f3 100644 --- a/git-flow/good-music-ol.md +++ b/git-flow/good-music-ol.md @@ -3,4 +3,9 @@ Ed Sheeran - I See Fire Parov Stelar - Booty Swing Electro Swing Collection O-ZONE NUMA NUMA -IMAGEINE DRAGONS - RADIOACTIVE \ No newline at end of file +IMAGEINE DRAGONS - RADIOACTIVE +"Freedom" by Anthony Hamilton & Elayna Boynton +SAIL - AWOLNATION +SAIL - AWOLNATION +Roxette +Gramofon From 7d591c45a7c8192f7e35549d105ffe3c7e9212c6 Mon Sep 17 00:00:00 2001 From: Honza Date: Tue, 31 Jan 2017 21:13:46 +0100 Subject: [PATCH 2/2] Konflikt --- git-flow/good-music-ol.md | 1 - 1 file changed, 1 deletion(-) diff --git a/git-flow/good-music-ol.md b/git-flow/good-music-ol.md index e6a41f3..ba07306 100644 --- a/git-flow/good-music-ol.md +++ b/git-flow/good-music-ol.md @@ -6,6 +6,5 @@ O-ZONE NUMA NUMA IMAGEINE DRAGONS - RADIOACTIVE "Freedom" by Anthony Hamilton & Elayna Boynton SAIL - AWOLNATION -SAIL - AWOLNATION Roxette Gramofon