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

Revert "Reposition Markdown formatting link"

Browse source 
This reverts commit 7fdda14cb8.

Conflicts:
	views/options/social/tavern.jade
This commit is contained in:
Bob Steffes 2013-11-30 16:26:35 -08:00
parent bb3f0ae7ec
commit b1e5ee6433
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
views/options/social/tavern.jade
View file

@ -103,11 +103,19 @@
.span8(ng-controller='ChatCtrl')
h3 Tavern Talk
<<<<<<< HEAD
include ./chat-box
small(style='position: relative; top: -20px; left: 25px;')
include ../../shared/formatting-help
small(style='position: relative; top: 18px; left: 0px')
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
=======
include ./chat-box
small
include ../../shared/formatting-help
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
>>>>>>> parent of 7fdda14... Reposition Markdown formatting link
ul.unstyled.tavern-chat
include ./chat-message