fix rebase errors (57ce7d6f) · Commits · Yannis Barlas / editoria · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

editoria
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents

Snippets Groups Projects

57ce7d6f

Commit 57ce7d6f authored 8 years ago by

john

Downloads
- Patches
- Plain Diff

fix rebase errors

parent 38d2d66b

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/components/SimpleEditor/Editor.js 7 additions, 6 deletions

app/components/SimpleEditor/Editor.js
app/components/SimpleEditor/config.js 4 additions, 0 deletions

app/components/SimpleEditor/config.js
app/components/SimpleEditor/panes/Comments/CommentsProvider.js 0 additions, 1 deletion

...omponents/SimpleEditor/panes/Comments/CommentsProvider.js
app/components/SimpleEditor/panes/TableOfContents/TableOfContents.js 1 addition, 2 deletions

...nts/SimpleEditor/panes/TableOfContents/TableOfContents.js

with 12 additions and 9 deletions

0% 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