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

c99aa7bd

Commit c99aa7bd authored May 13, 2014 by Maran Hidskes

Downloads
- Plain Diff

Fix merge conflict

parents 5208b048 03371b74

Branches

Tags

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

ethereal/assets/qml/webapp.qml 2 additions, 2 deletions

ethereal/assets/qml/webapp.qml
ethereal/ui/ext_app.go 1 addition, 1 deletion

ethereal/ui/ext_app.go
ethereal/ui/gui.go 1 addition, 1 deletion

ethereal/ui/gui.go

with 4 additions and 4 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