Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
officejs
Repository
50d6fc2f00d96a37ee358965d0a23f1019f50ccc
Switch branch/tag
officejs
OfficeJS
component
basic_conflict_solver.html
Find file
Blame
History
Permalink
Fix bug: solve conflict by removing document works correctly now
· 50d6fc2f
Tristan Cavelier
authored
Aug 07, 2012
50d6fc2f
basic_conflict_solver.html
1.89 KB
Edit
Web IDE
Replace basic_conflict_solver.html
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace basic_conflict_solver.html
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
