From e1bb5bc860bea1480e7e58fdb59e856cefec870c Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Mon, 13 Jan 2014 02:49:30 -0800
Subject: [PATCH] Oops.

---
 src/xenia/apu/xaudio2/xaudio2_audio_system.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc
index 95604e9e6..858fea7e2 100644
--- a/src/xenia/apu/xaudio2/xaudio2_audio_system.cc
+++ b/src/xenia/apu/xaudio2/xaudio2_audio_system.cc
@@ -88,11 +88,7 @@ void XAudio2AudioSystem::Initialize() {
   config.LogFileline      = TRUE;
   audio_->SetDebugConfiguration(&config);
 
-<<<<<<< HEAD
   hr = audio_->CreateMasteringVoice(&mastering_voice_, active_channels_, 48000);
-=======
-  hr = audio_->CreateMasteringVoice(&mastering_voice_, 6, 48000);
->>>>>>> 6f09c12bc280b70e852867ba182dde6fef652f54
   if (FAILED(hr)) {
     XELOGE("CreateMasteringVoice failed with %.8X", hr);
     XEASSERTALWAYS();