[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.2-1-7-gc7c4cf7

[Stefan Ebner]

The following commit has been merged in the master branch:
commit c7c4cf7b47a4e1d41439367d1bdc1387736eab01
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Wed Dec 22 02:45:34 2010 +0100

    resolve conflict

diff --git a/MainWindow.cs b/MainWindow.cs
index 139e415..52833d9 100644
--- a/MainWindow.cs
+++ b/MainWindow.cs
@@ -296,13 +296,9 @@ public partial class MainWindow: Gtk.Window
 		
 		if (mode == "advanced") {
 			param = param + "-audio "+adriver+" -midi "+mdriver;
-<<<<<<< HEAD
-			if (adriver == "jack"){
-=======
 			if (adriver == "alsa"){
 				param = param+" -audiodev default ";
 			} if (adriver == "jack"){
->>>>>>> upstream/0.60.3
 				if (autoa == "1"){
 					param = param+" -autoconn";
 				}

-- 
monobristol