remove merge conflict

diff --git a/config.py b/config.py
index 6e4905aee43e6e48fa9ea91f2960012b5d3dd423..f7c1aaf6564ecbbc71b50163e6dae3192efa91c5 100644 (file)
--- a/config.py
+++ b/config.py
@@ -6,7 +6,7 @@ pseudo="salesman"
 chanlist=["#bot","#flood"]
 play_channels=["#flood"]
 stay_channels=["#flood","#bot"]
-overops=["[20-100]","[20-100]_"]
+overops=["[20-100]"]
 ops=["PEB","Petite-Peste"]
 
 report_bugs_to = ["[20-100]"]
@@ -47,7 +47,7 @@ leave_messages=[u"On continuera à jouer plus tard ;)"]
 # temps au bout duquel, si personne n'a parlé, on se tait
 idle_time=20*60
 # liste des bots, qui ne sont pas considérés comme de l'activité
-idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___","Sanctuary","Saturnin","Flo"]
+idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___","Sanctuary","Saturnin","Flo","marcel"]
 idle_messages=["^(pan|bang|bim)$"]
 
 #: bad guys 

diff --git a/questions.txt b/questions.txt
index b94f7808ad2b4f5dbb44ab19def7d10a415f8cec..688ffe96613070afdf49f51940b4aa1799cde929 100644 (file)
--- a/questions.txt
+++ b/questions.txt
@@ -205,7 +205,7 @@
 207 | Département n°01 | Ain
 208 | Département n°02 | Aisne
 209 | Département n°03 | Allier
-210 | Département n°04 | Alpes-de-Hautes-Provence
+210 | Département n°04 | Alpes-de-Haute-Provence
 211 | Département n°05 | Hautes-Alpes
 212 | Département n°06 | Alpes-Maritimes
 213 | Département n°07 | Ardèche

diff --git a/salesman.py b/salesman.py
index d7e00442ceed6264bdab22bb2018d00d34a80eb2..12394a5f036ea964a22524b359de024c7c559d64 100755 (executable)
--- a/salesman.py
+++ b/salesman.py
@@ -129,9 +129,9 @@ class Salesman(ircbot.SingleServerIRCBot):
 
     def start_enigme(self,serv,channel,token=None):
         # On reste silencieux si lechan n'est pas actif
-        if not self.is_active(channel):
-            serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token))
-            return
+        #if not self.is_active(channel):
+        #    serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token))
+        #    return
         if self.play_status[channel][0]==0 and channel in self.play_channels:
             ok="skip"
             if token==self.play_status[channel][-1]: