From dde810138a911e4beac6b60f80e93ee779a514c7 Mon Sep 17 00:00:00 2001
From: Seth Meranda <smeranda2@unl.edu>
Date: Wed, 16 Sep 2009 20:29:43 +0000
Subject: [PATCH] resolved conflict.
---
plugins/messages/views/default/messages/topbar.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/messages/views/default/messages/topbar.php b/plugins/messages/views/default/messages/topbar.php
index a4bf3fa3..fe0f12ae 100644
--- a/plugins/messages/views/default/messages/topbar.php
+++ b/plugins/messages/views/default/messages/topbar.php
@@ -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
}
--
GitLab