Fix merge conflict

2014-05-27 10:29:12 +02:00
parent f7eb4e587f d694e00a33
commit 474c85bc9d
4 changed files with 63 additions and 46 deletions
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@ -130,7 +130,7 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
 	gui.win = win
 	gui.uiLib.win = win

-	db := &Debugger{gui.win, make(chan bool)}
+	db := &Debugger{gui.win, make(chan bool), true}
 	gui.lib.Db = db
 	gui.uiLib.Db = db