diff options
| author | Minteck <contact@minteck.org> | 2022-06-04 16:15:12 +0200 |
|---|---|---|
| committer | Minteck <contact@minteck.org> | 2022-06-04 16:15:12 +0200 |
| commit | 53d1dc7f09490227cd1905b420153d512ac0927a (patch) | |
| tree | d58690711e577ee21bbea2501a86e3a95d35cc8e | |
| parent | 919d3a377500382d835b0d548e00be83e00a8315 (diff) | |
| parent | e93d0263dc90fdea94f6a5fb89faa910097e7c16 (diff) | |
| download | cdn-53d1dc7f09490227cd1905b420153d512ac0927a.tar.gz cdn-53d1dc7f09490227cd1905b420153d512ac0927a.tar.bz2 cdn-53d1dc7f09490227cd1905b420153d512ac0927a.zip | |
Fix merge conflict
| -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 |