sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 11:38:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove merge conflict marking

Browse source
This commit is contained in:
Blade Barringer 2015-08-29 07:18:17 -05:00
parent a0040d736f
commit 8cb11aa85d
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/views/options/social/group.jade
View file

@ -53,11 +53,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
br
p=env.t('groupLeader')
|:
<<<<<<< HEAD
a.badge.badge-info(ng-click='clickMember(group.leader._id, true)')
=======
a(class='badge badge-info', ng-click='clickMember(group.leader._id, true)')
>>>>>>> develop
| {{group.leader.profile.name}}
.text-center(ng-if='group.type === "party"')