Skip to content
This repository has been archived by the owner on May 2, 2019. It is now read-only.

problem: solution field is not displayed #60 #71

Merged
merged 1 commit into from
May 31, 2018

Conversation

samuelralak
Copy link
Member

Solution: Added solution to problem detail page

@gsovereignty
Copy link
Member

@samuelralak conflicts

@emurgobot
Copy link
Member

Heads up @samuelralak, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

@samuelralak
Copy link
Member Author

on it.

Solution: Added solution to problem detail page
@samuelralak
Copy link
Member Author

fixed conflicts. @geekyd let me know if PR overwrites any of your changes once merged

<p>{{problem.description}}</p>


{{#if isProblemOwner problem.createdBy}}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I had done that as part of #63. not to worry though, my next PR should fix all that will have been deleted

@kriswormwood kriswormwood merged commit b6a450e into EmurgoHK:master May 31, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants