Merge pull request #21 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Mon, 10 Aug 2015 10:26:34 +0000 (12:26 +0200)
committerlittlesat <littlesat99@yahoo.com>
Mon, 10 Aug 2015 10:26:34 +0000 (12:26 +0200)
commit805b1b2f7b6f7e7b250d1dabcfc224e49adec6ef
treee5c1260335613d0b506adc91384ae82bf34f6a2d
parentc3702aa750bfa68157c3b914c98500f4dcf072f3
parent035a34f12316d5ee9cb999fc59a6e076824065c4
Merge pull request #21 from Dima73/master

Fix conflict timers (step 4)