Commit Graph

2 Commits

Author SHA1 Message Date
Hadi Nategh
aac5309c8f Add "Allow ignore conflicts" feature for resources 2014-01-29 13:46:30 +00:00
Nathan Gray
9419fec5c6 Forgotten config template 2012-12-18 15:31:09 +00:00