Merge pull request #86 from Dima73/timer
authorlittlesat <littlesat99@yahoo.com>
Fri, 6 Nov 2015 21:39:02 +0000 (22:39 +0100)
committerlittlesat <littlesat99@yahoo.com>
Fri, 6 Nov 2015 21:39:02 +0000 (22:39 +0100)
Add option enable/disable conflict detection for each timer


Trivial merge