Skip to content
Snippets Groups Projects
Unverified Commit d6a7e6d5 authored by akwizgran's avatar akwizgran Committed by akwizgran
Browse files

Resolve merge conflicts. 

# Conflicts:
#   briar-android/build.gradle
#   briar-android/src/test/java/org/briarproject/briar/android/login/SetupActivityTest.java
parents e30e34f3 df99b3b6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 677 additions and 232 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment