From aba9e517b3e1638bf1a633f7df34094786a3230e Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 22 Oct 2014 10:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_links.html.erb | 1 -
 app/views/memos/show.html.erb         | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 698198120..f6b7ee7dd 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -33,7 +33,6 @@
   	<% end %>
   <% end %>
   <% if options[:author] %>
-      <!-- modified by zjc author添加超链接 -->
     <span class="author" title="attachment.author">
       <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>,
       <%= format_time(attachment.created_on) %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 2736ca81b..e121098f4 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -61,7 +61,6 @@
 			</p>
 			<div class="clearfix"></div>
 		</div>
-      <!-- modified by zjc 修正名字无链接问题 -->
 		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
 
 	</div>
@@ -128,7 +127,6 @@
 				</td>
 			</tr>
 			<tr>
-              <!-- modified by zjc 修正名字无链接问题 -->
 				<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author %></td>
 			</tr>
 		</table>