base footer merge bug.

app/views/layouts/_base_footer.html.erb

@@ -1,5 +1,4 @@
 <!--add by huang-->
-<% cache "footer" do %>
 <div class="clearfix"></div>
 <div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;">
 	<div style="border-top:solid 1px #C6E9F1;"></div>
@@ -31,16 +30,8 @@
 </div>
 <div class="debug">
   <%= debug(params) if Rails.env.development? %>
-<<<<<<< HEAD
-</div>
-<div class="hidden">
-  <script src="http://s4.cnzz.com/z_stat.php?id=1000482288&web_id=1000482288" language="JavaScript">
-  </script>
-  <script>
-=======
   <div class="hidden">
     <script>
->>>>>>> 6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5
 
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -52,7 +43,5 @@
 
     </script>
   </div>
-  
 </div>
 
-<% end %>