Removed conflict mark
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Jul 2014 06:45:39 +0000 (08:45 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Jul 2014 07:14:07 +0000 (09:14 +0200)
commitf5e3f97ef1591ebe1fc814f188aae5d69f6d7d55
tree6134a5194538ffaffb22c5c101fdd18e31e5fe7a
parent92876a038c38cf666af73291e11898b496462751
Removed conflict mark
src/com/owncloud/android/utils/ErrorMessageAdapter.java