Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FUCoin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

2b7d5802

Unverified Commit 2b7d5802 authored 9 years ago by David Bohn

Downloads
- Plain Diff

Fixed merge conflicts

parents 8a4b6fd0 52740f26

No related branches found

No related tags found

2 merge requests!5Configuration system,!4Added tell supervisor action to make system init work

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fucoin/actions/join/ActionJoinAnswer.java 4 additions, 0 deletions

src/main/java/fucoin/actions/join/ActionJoinAnswer.java
src/main/java/fucoin/supervisor/SuperVisorImpl.java 2 additions, 0 deletions

src/main/java/fucoin/supervisor/SuperVisorImpl.java
src/main/java/fucoin/wallet/AbstractWallet.java 1 addition, 0 deletions

src/main/java/fucoin/wallet/AbstractWallet.java
src/main/java/fucoin/wallet/WalletImpl.java 8 additions, 0 deletions

src/main/java/fucoin/wallet/WalletImpl.java

with 15 additions and 0 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