Fixed merge issues. (3d575162) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

3d575162

Unverified Commit 3d575162 authored 9 years ago by akwizgran

Downloads
- Patches
- Plain Diff

Fixed merge issues.

parent c2a1cc1e

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/AndroidComponent.java 2 additions, 3 deletions

...ndroid/src/org/briarproject/android/AndroidComponent.java
briar-android/src/org/briarproject/android/SettingsActivity.java 8 additions, 2 deletions

...ndroid/src/org/briarproject/android/SettingsActivity.java
briar-core/src/org/briarproject/clients/ClientsModule.java 17 additions, 7 deletions

briar-core/src/org/briarproject/clients/ClientsModule.java
briar-core/src/org/briarproject/clients/PrivateGroupFactoryImpl.java 2 additions, 1 deletion

...src/org/briarproject/clients/PrivateGroupFactoryImpl.java

with 29 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment