From 02d08e266a577f82b84a8fe0fbf8bfb83c2e7edc Mon Sep 17 00:00:00 2001
From: Oli <olivier.belanger@umontreal.ca>
Date: Fri, 21 Sep 2007 00:21:40 +0000
Subject: oups...!

---
(limited to 'TamTamEdit.activity/Edit/MainWindow.py')

diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 3ab06c6..65aa464 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -2192,9 +2192,6 @@ class instrumentPalette( Popup ):
         category = widget.props.value
         instruments = self.getInstruments(category)
         self.loadInstrumentMenu(instruments)
-<<<<<<< HEAD:TamTamEdit.activity/Edit/MainWindow.py
-
-=======
         
     def setCategory(self, category):
         self.categoryBox.set_active(self.categories.index(category))
@@ -2202,7 +2199,6 @@ class instrumentPalette( Popup ):
     def setInstrument(self, instrument):
         self.instrumentBox1.set_active(self.instruments.index(instrument))
         
->>>>>>> 3f04e198e432714701cbdabf7ff244b29a960724:TamTamEdit.activity/Edit/MainWindow.py
     def loadInstrumentMenu(self, instruments):
         self.instrumentBox1.remove_all()
         for instrument in instruments:
--
cgit v0.9.1