Commit graph

3 commits

Author SHA1 Message Date
Markus Unterwaditzer
78065a4e1f Implement conflict resolution
Fix #4
2014-03-01 00:51:29 +01:00
Markus Unterwaditzer
84ee96c394 Better logging 2014-02-28 14:44:08 +01:00
Markus Unterwaditzer
55c33d749b Add example config 2014-02-28 14:44:08 +01:00