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
Languages
JavaScript 61.6%
TypeScript 31.8%
SCSS 2.5%
Java 2%
Pug 0.7%
Other 1.2%