Private GIT

Skip to content
Snippets Groups Projects
Commit 4a694cfe authored by Kevin Duret's avatar Kevin Duret
Browse files

fix(conflict): remove conflict git log

parent cfbea870
No related branches found
No related tags found
No related merge requests found
......@@ -793,9 +793,4 @@ if ($valid) {
document.getElementById('sNone').checked = false;
}
}
<<<<<<< HEAD
</script>
=======
}
</script>
>>>>>>> 1c456741a... feat(api): Split role between configuration and realtime
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment