good morning!!!!

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

bor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

474c85bc

Commit 474c85bc authored 10 years ago by Maran Hidskes

Downloads
- Plain Diff

Fix merge conflict

parents f7eb4e58 d694e00a

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

ethereal/assets/qml/wallet.qml 44 additions, 31 deletions

ethereal/assets/qml/wallet.qml
ethereal/assets/samplecoin/samplecoin.html 1 addition, 1 deletion

ethereal/assets/samplecoin/samplecoin.html
ethereal/ui/gui.go 1 addition, 1 deletion

ethereal/ui/gui.go
ethereal/ui/ui_lib.go 18 additions, 14 deletions

ethereal/ui/ui_lib.go

with 64 additions and 47 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