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.

Sign up for GitHub

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

Jump to bottom

Fix conflicts #123

Merged
merged 2 commits into from
Mar 21, 2019
Merged

Fix conflicts #123

merged 2 commits into from
Mar 21, 2019

Conversation

FractalPolarity
Copy link
Contributor

@FractalPolarity FractalPolarity commented Mar 20, 2019 •
edited

fix for https://appsilon.github.io/shiny.semantic/

removed merge conflicts and redundant tags

closes #122

dokato
dokato approved these changes Mar 21, 2019
View reviewed changes
Copy link
Contributor

@dokato dokato left a comment

Choose a reason for hiding this comment

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

LGTM

@dokato dokato mentioned this pull request Mar 21, 2019
Closed
@FractalPolarity FractalPolarity changed the title Fix conflits Fix conflicts Mar 21, 2019
@FractalPolarity FractalPolarity merged commit 36e0217 into develop Mar 21, 2019
@dokato dokato deleted the fix-conflits branch March 22, 2019 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dokato dokato dokato approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge conflicts in docs/index.html not completely resolved
2 participants
@FractalPolarity @dokato