From 67da88fab5c823137307228c1a6d7ef70503ef7a Mon Sep 17 00:00:00 2001
From: Tomofumi Tanaka <tanacasino@gmail.com>
Date: Sun, 1 Jun 2014 22:45:10 +0900
Subject: [PATCH] Use "Conversation" instead of "Discussion"

Github uses "Conversation" now.
---
 .../{discussion.scala.html => conversation.scala.html}      | 0
 src/main/twirl/pulls/pullreq.scala.html                     | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/twirl/pulls/{discussion.scala.html => conversation.scala.html} (100%)

diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/conversation.scala.html
similarity index 100%
rename from src/main/twirl/pulls/discussion.scala.html
rename to src/main/twirl/pulls/conversation.scala.html
diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html
index e7b0975ab..f26941257 100644
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -33,13 +33,13 @@
         }
       </div>
       <ul class="nav nav-tabs fill-width pull-left" id="pullreq-tab">
-        <li class="active"><a href="#discussion">Discussion</a></li>
+        <li class="active"><a href="#conversation">Conversation</a></li>
         <li><a href="#commits">Commits <span class="badge">@commits.size</span></a></li>
         <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
       </ul>
       <div class="tab-content fill-width pull-left">
-        <div class="tab-pane active" id="discussion">
-          @pulls.html.discussion(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
+        <div class="tab-pane active" id="conversation">
+          @pulls.html.conversation(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
         </div>
         <div class="tab-pane" id="commits">
           @pulls.html.commits(dayByDayCommits, repository)