Updated conflict message (same as in web app)
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Aug 2015 15:29:42 +0000 (17:29 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Aug 2015 15:29:42 +0000 (17:29 +0200)

No differences found