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
S
Description
No description provided
AGPL-3.0 242 MiB
Languages
JavaScript 62.9%
TypeScript 29.4%
SCSS 2.6%
Java 2.1%
Pug 0.8%
Other 2.1%