Skip to content
Snippets Groups Projects
Commit dde81013 authored by Seth Meranda's avatar Seth Meranda
Browse files

resolved conflict.

parent 8e48e67a
No related branches found
No related tags found
No related merge requests found
......@@ -30,8 +30,8 @@
<?php
}else{
?>
<li><a href="<?php echo $vars['url']; ?>pg/messages/<?php echo $_SESSION['user']->username; ?>" class="privatemessages_new" ><span>Inbox <sup class="totalCount"><?php echo $num; ?></sup></span></a></li>
<li><a href="<?php echo $vars['url']; ?>pg/messages/<?php echo $_SESSION['user']->username; ?>" class="privatemessages_new" ><span>Inbox <sup><?php echo $num; ?></sup></span></a></li>
<?php
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment