Resolve merge conflicts. (286937e4) · 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

286937e4

Commit 286937e4 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Resolve merge conflicts.

parents a3b5ff0b 2908145a

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
.gitlab-ci.yml 0 additions, 2 deletions

.gitlab-ci.yml
.idea/codeStyles/Project.xml 261 additions, 0 deletions

.idea/codeStyles/Project.xml
.idea/codeStyles/codeStyleConfig.xml 5 additions, 0 deletions

.idea/codeStyles/codeStyleConfig.xml
briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java 113 additions, 35 deletions

...org/briarproject/briar/android/test/TestDataActivity.java
briar-android/src/main/res/layout/activity_test_data.xml 1 addition, 1 deletion

briar-android/src/main/res/layout/activity_test_data.xml
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java 1 addition, 1 deletion

...java/org/briarproject/briar/api/test/TestDataCreator.java
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java 3 additions, 0 deletions

...java/org/briarproject/briar/test/TestDataCreatorImpl.java

with 385 additions and 39 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