andreasnaive b380514764 Revert "conflict resolution (nw)" ... This reverts commit c24473ddff, reversing changes made to 009cba4fb8.		2019-03-25 23:13:40 +01:00
..
src/main	Revert "conflict resolution (nw)"	2019-03-25 23:13:40 +01:00
build.gradle	Android compile fix (#4395)	2018-12-11 19:38:27 -05:00