Changeset 8633 for branches/crazyhorse/wp-admin/admin-footer.php

Timestamp:

08/13/2008 02:59:05 AM (18 years ago)

Author:

azaozz

Message:

Crazyhorse: some more merge cleanup

File:

• branches/crazyhorse/wp-admin/admin-footer.php (modified) (2 diffs)

branches/crazyhorse/wp-admin/admin-footer.php

@@ -1 @@
-<<<<<<< .working
-<?php if ( ! $fixed_bar ) { ?>
-<br class="clear" /></div><!-- wpbody-content -->
-<?php } ?>
-=======
 <?php
 /**
@@ -11 +6 @@
  * @subpackage Administration
  */
-?>
->>>>>>> .merge-right.r8619
+
+if ( ! $fixed_bar ) { ?>
+<br class="clear" /></div><!-- wpbody-content -->
+<?php } ?>
+
 </div><!-- wpbody -->
 </div><!-- wpcontent -->
 </div><!-- wpwrap -->
-
 <div id="footer">
 <p><?php