diff options
Diffstat (limited to 'statusbar.php')
| -rw-r--r-- | statusbar.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/statusbar.php b/statusbar.php index 212700b..9300121 100644 --- a/statusbar.php +++ b/statusbar.php @@ -191,4 +191,8 @@ if (isset($_PROFILE["projectRoles"]) && is_array($_PROFILE["projectRoles"]) && i }) </script> </body> -</html>
\ No newline at end of file +<<<<<<< HEAD +</html> +======= +</html> +>>>>>>> e93d0263dc90fdea94f6a5fb89faa910097e7c16 |