Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/fixing tbb buttons #22

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix/fixing tbb buttons #22

wants to merge 3 commits into from

Conversation

saattalla
Copy link
Collaborator

Description

Added

Changed

Removed

How should this be manually tested?

@saattalla
Copy link
Collaborator Author

Changed tbb buttons to implement circle and square.

Copy link
Member

@danielmapar danielmapar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the merge conflict, and also write the PR steps as usual

@@ -1,3 +1,548 @@
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have a merge conflict that needs to be solved

@danielmapar danielmapar added the enhancement New feature or request label Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants