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)
commit156cb5e81b63ca1d3d79ba446a32470aa5e2e78b
tree317eed22f831530d94b4f5a6f70853eb101a58a1
parent3512eae861faa6ac60ebacdcb16a3db4e1394f4b
Updated conflict message (same as in web app)
res/values/strings.xml