Fix rebasing mistakes. (c55bef95) · 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

c55bef95

Verified Commit c55bef95 authored 6 years ago by akwizgran

Downloads
- Patches
- Plain Diff

Fix rebasing mistakes.

parent fb6b4872

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java 1 addition, 1 deletion

...java/org/briarproject/bramble/test/ValidatorTestCase.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionCryptoImpl.java 2 additions, 2 deletions

...iarproject/briar/introduction/IntroductionCryptoImpl.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java 30 additions, 33 deletions

...arproject/briar/introduction/IntroductionManagerImpl.java
briar-core/src/test/java/org/briarproject/briar/introduction/MessageEncoderParserIntegrationTest.java 4 additions, 2 deletions

...iar/introduction/MessageEncoderParserIntegrationTest.java

with 37 additions and 38 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