[Bast-commits] r9889 - in ironman/IronMan-Web/tags/IronMan-Web-0.02: . root

[idn at dev.catalyst.perl.org]

Author: idn
Date: 2011-07-05 10:21:05 +0000 (Tue, 05 Jul 2011)
New Revision: 9889

Modified:
   ironman/IronMan-Web/tags/IronMan-Web-0.02/
   ironman/IronMan-Web/tags/IronMan-Web-0.02/root/new_feed.tt
Log:
Merge from trunk


Property changes on: ironman/IronMan-Web/tags/IronMan-Web-0.02
___________________________________________________________________
Modified: svn:mergeinfo
   - /ironman/IronMan-Web/branches/user_edit:9627-9875
/ironman/IronMan-Web/trunk:9860-9884
   + /ironman/IronMan-Web/branches/user_edit:9627-9875
/ironman/IronMan-Web/trunk:9860-9888

Modified: ironman/IronMan-Web/tags/IronMan-Web-0.02/root/new_feed.tt
===================================================================
--- ironman/IronMan-Web/tags/IronMan-Web-0.02/root/new_feed.tt	2011-07-05 10:20:31 UTC (rev 9888)
+++ ironman/IronMan-Web/tags/IronMan-Web-0.02/root/new_feed.tt	2011-07-05 10:21:05 UTC (rev 9889)
@@ -1,4 +1,3 @@
-    <div id='main'>
      [% IF existed %]
        <p class="error">
         [% params.url %] is already signed up.