github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-28 23:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge issues

Browse source
This commit is contained in:
James Allen 2016-11-10 10:53:30 +00:00
parent 812ee82af1
commit 4e2dd55cfd
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/editor.jade
View file

@ -72,13 +72,9 @@ div.full-size(
.rp-entry-avatar(style="background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%);") {{ users[entry.metadata.user_id].avatar_text }}
.rp-entry-body
{{ entry.content }}
<<<<<<< HEAD
.review-entry-actions
.rp-entry-actions
a(href, ng-click="acceptChange(entry_id)") Accept
a(href, ng-click="rejectChange(entry_id)") Reject
=======
.rp-entry-actions
>>>>>>> cb425e7dba4f0caa9629cc7f5c45b4a4992de609
div(ng-if="entry.type == 'comment'")
div(ng-repeat="comment in entry.thread", class="comment-thread__comment")