A web-based collaborative LaTeX editor
Find a file
Brian Gough 1078688895 Merge pull request #1716 from sharelatex:bg-fix-merge-conflict
fix incorrect merge conflict

GitOrigin-RevId: 55e19f025a433e8abbde16bd68ccbc3e21f7964f
2019-04-16 10:05:38 +00:00
services/web Merge pull request #1716 from sharelatex:bg-fix-merge-conflict 2019-04-16 10:05:38 +00:00