landry 1f6e967281 Adjust the conflict marker with xfce4-datetime since it will be
resurrected. In the doubtful case someone updates from Xfce 4.2.1, back
in 2007....
2013-12-28 11:02:11 +00:00
..
2013-05-31 19:21:31 +00:00
2013-05-31 19:23:10 +00:00
2013-05-31 19:21:48 +00:00
2013-09-25 15:59:44 +00:00