From: Maxime Bombar <bombar@crans.org>
Date: Tue, 20 Jun 2017 07:16:59 +0000 (+0200)
Subject: remove merge conflict
X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsalesman.git;a=commitdiff_plain;h=5a0e906c5317dcae3df0405c0cd4cec8e123f568;hp=cc61e659ac3677bed6687bc346411125482f9da0

remove merge conflict
---

diff --git a/config.py b/config.py
index 6e4905a..f7c1aaf 100644
--- 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 b94f780..688ffe9 100644
--- 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 d7e0044..12394a5 100755
--- 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]: