Merge remote-tracking branch 'remotes/origin/szzh' into develop

This commit is contained in:
nwb 2014-07-03 15:51:49 +08:00
commit bc50390a2e
1 changed files with 0 additions and 1 deletions

View File

@ -52,7 +52,6 @@
<!-- Added by Longjun 在最后一页显示创建信息 --> <!-- Added by Longjun 在最后一页显示创建信息 -->
<% if format_date(day) == format_date(@date_to - @days) %> <% if format_date(day) == format_date(@date_to - @days) %>
<h1>Test</h1>
<div > <div >
<table width="660"> <table width="660">
<tr> <tr>