Merge pull request #24 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Wed, 12 Aug 2015 18:24:56 +0000 (20:24 +0200)
committerlittlesat <littlesat99@yahoo.com>
Wed, 12 Aug 2015 18:24:56 +0000 (20:24 +0200)
commit980db52f5ceccd83c0a5cc478cb9ea8d34b2b1fa
tree8ccaf43fd0348f47ff1a449fd8756c0e379f2a24
parenteea612e836dd96b6f6eac78312078f8050d2d478
parent64563213de54501617a6662a5a446a34d20a54c6
Merge pull request #24 from Dima73/master

Fix conflict timers (step 6)