X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=MusicPlayer%2FMusicPlayers.groovy;h=c2d8b75dda55204f5742f4e6e637a5004931eea3;hp=486feeac79a9f468c945db62ec22eb3081d44322;hb=9a9f34091fe2231e5f0010987ac3a24800aaae78;hpb=de35dfa319418baf7ba4bc2eeb4dbfc0fd20230a

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index 486feea..c2d8b75 100644
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -44,9 +44,6 @@ public class MusicPlayers {
 		} else {
 			this.status = "stopped"
 		}
-<<<<<<< HEAD
-
-=======
 		def initTrack = Verify.getIntFromList(1, 2, 3)
 		this.trackNumber = initTrack 
 		def initData = Verify.getBoolean()
@@ -61,7 +58,6 @@ public class MusicPlayers {
 		} else {
 			this.trackDescription = "someOtherDescriptions"
 		}*/
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
 		musicPlayers.add(new MusicPlayer(sendEvent, id, label, displayName, this.level, this.mute, this.status, this.trackNumber, this.trackData, this.trackDescription))
 	}