resolve merge conflict (0905f37a) · 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

0905f37a

Commit 0905f37a authored 8 years ago by

john

Downloads
- Plain Diff

resolve merge conflict

parents 3b6233d7 7253fdd2

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/SimpleEditor.scss 17 additions, 2 deletions

app/components/SimpleEditor/SimpleEditor.scss
app/components/SimpleEditor/elements/track_change/TrackChangeComponent.js 75 additions, 16 deletions

...impleEditor/elements/track_change/TrackChangeComponent.js
app/components/SimpleEditor/elements/track_change/TrackChangeControlCommand.js 1 addition, 0 deletions

...Editor/elements/track_change/TrackChangeControlCommand.js
app/components/SimpleEditor/elements/track_change/trackChange.scss 35 additions, 14 deletions

...nents/SimpleEditor/elements/track_change/trackChange.scss

with 128 additions and 32 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