resolve conflict

11 years ago · e5e24c1163
parent 64cbeddd13
commit e5e24c1163
3 changed files with 272 additions and 273 deletions
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@ -135,7 +135,6 @@ function f_submit()
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
 <title>意见反馈</title>
 </head>