Changeset 851

Timestamp:

01/16/2009 07:41:57 AM (16 years ago)

Author:

apeatling

Message:

Removing conflict.

File:

• trunk/buddypress-theme/buddypress-home/comments.php (modified) (1 diff)

trunk/buddypress-theme/buddypress-home/comments.php

@@ -72 +72 @@
 
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<<<<<<< .mine
 <p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
-=======
-<p>You must be <a href="<?php echo site_url(); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
->>>>>>> .r392
 <?php else : ?>