From aadbcdd5e7bb1be735ea771aa9aac6ed9bd6c481 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Sat, 21 Oct 2006 09:26:42 +0000
Subject: [PATCH] Fix merge bug

---
 Sources/VLSoundOut.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Sources/VLSoundOut.cpp b/Sources/VLSoundOut.cpp
index f84fc75..fa82c58 100644
--- a/Sources/VLSoundOut.cpp
+++ b/Sources/VLSoundOut.cpp
@@ -55,13 +55,6 @@ VLSoundOut * VLSoundOut::Instance()
 		if (!sSoundScheduler.get())
 			sSoundScheduler.reset(new VLSoundScheduler);
 	}
-}
-
-VLSoundOut * VLSoundOut::Instance()
-{
-	if (!sSoundOut.get()) 
-		sSoundOut.reset(new VLAUSoundOut);
-
 	return sSoundOut.get();
 }