From 0dd911f2bafca41bc808688897283e95177feef5 Mon Sep 17 00:00:00 2001
From: Bob Steffes <bobbyroberts99@gmail.com>
Date: Sat, 30 Nov 2013 16:29:17 -0800
Subject: [PATCH] Revert "Re-modify position of markdown down formatting link"

This reverts commit 7fdda14cb8d915e8593e15be9fce87c8224ac531.

Conflicts:
	views/options/social/tavern.jade
---
 views/options/social/tavern.jade | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade
index d76326602a..c72717615d 100644
--- a/views/options/social/tavern.jade
+++ b/views/options/social/tavern.jade
@@ -103,6 +103,7 @@
 
   .span8(ng-controller='ChatCtrl')
     h3 Tavern Talk
+<<<<<<< HEAD
 <<<<<<< HEAD
         include ./chat-box
         small(style='position: relative; top: -20px; left: 25px;')
@@ -117,5 +118,13 @@
         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
+=======
+      include ./chat-box
+      small(style='position: relative; top: -130px; left: 26px; z-index: 10;')
+        include ../../shared/formatting-help
+      small
+          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 db7e582... Re-modify position of markdown down formatting link
     ul.unstyled.tavern-chat
       include ./chat-message