From f59b74e27f4f8074bb353b1c85b5e47a80b718d2 Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Mon, 8 Apr 2013 17:19:28 -0400
Subject: [PATCH] fix nitpick and merge master

---
 .../discussion/mustache/_inline_thread_show.mustache          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/templates/discussion/mustache/_inline_thread_show.mustache b/lms/templates/discussion/mustache/_inline_thread_show.mustache
index 0a72201a41..b961aadcc4 100644
--- a/lms/templates/discussion/mustache/_inline_thread_show.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_show.mustache
@@ -3,8 +3,8 @@
     <header>
         <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote"><span class="plus-icon">+</span> <span class='votes-count-number'>{{votes.up_count}}</span></a>
         <h3>{{title}}</h3>
-<div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
-<i class="icon"></i><span class="pin-label">Pinned</span></div>
+        <div class="discussion-pin-inline pinned  pinned-{{pinned}}" data-tooltip="This thread has been pinned by course staff.">                
+        <i class="icon"></i><span class="pin-label">Pinned</span></div>
 
         <p class="posted-details">
             {{#user}}