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

Backend. Module Blog. Move SUMMARY field to top #2797

Merged
merged 3 commits into from May 8, 2019

Conversation

Projects
None yet
2 participants
@Sellato
Copy link
Contributor

commented Apr 18, 2019

  • Enhancement

Pull request description

I think the right order of fields should be:

  1. Summary
  2. Image
  3. MainContent

Sellato added some commits Apr 18, 2019

@Sellato

This comment has been minimized.

Copy link
Contributor Author

commented Apr 18, 2019

This branch has conflicts that must be resolved

I can't understand why there is "conflict". All changes I made via web interface :(
I'll be glad to get your help.
Thank you.

@carakas

This comment has been minimized.

Copy link
Member

commented Apr 18, 2019

don't worry about the merge conflicts, I'll resolve them

@carakas

This comment has been minimized.

Copy link
Member

commented Apr 18, 2019

@Sellato it is because of this
676 commits behind forkcms:master

You need to add the remote for fork
git remote add forkcms git@github.com:forkcms/forkcms.git

And then pull the changes of master on your master branch

@carakas

carakas approved these changes May 8, 2019

@carakas carakas added this to the 5.5.3 milestone May 8, 2019

@carakas carakas merged commit f6aa98d into forkcms:master May 8, 2019

3 checks passed

Scrutinizer Analysis: No new issues – Tests: passed
Details
continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Sellato Sellato deleted the Sellato:sellato branch May 8, 2019

@carakas carakas modified the milestones: 5.5.3, 6.0.0, 5.6.0 May 21, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.