Remove anoying warning about conflict removal introduced in af4dcd4
authorlittlesat <littlesat99@yahoo.com>
Sun, 15 Nov 2015 18:05:45 +0000 (19:05 +0100)
committerlittlesat <littlesat99@yahoo.com>
Sun, 15 Nov 2015 18:05:45 +0000 (19:05 +0100)
commitf91e9af750224d4a62e36cc41feddbcf9e8fe583
treeecc6129d28706aadeb05ac59fc5b4617ba1749c8
parente805ee9da0f094bdbcb93e9641d33d5e1e28e011
Remove anoying warning about conflict removal introduced in af4dcd4
lib/python/Screens/TimerEdit.py