Correction erreur lors de la résolution du conflit.

src/UnicaenAuth/View/Helper/UserCurrent.php

@@ -70,12 +70,11 @@ class UserCurrent extends UserAbstract
    href="#">$status</a>
 EOS;
         $out .= PHP_EOL;
-        $out .= <<<EOS
-<script type="text/javascript">
-    $(function() {
-        $("#$id").popover({ html: true, container: '#navbar' });
-    });
-</script>
+        
+        $js = <<<EOS
+$(function() {
+    $("#$id").popover({ html: true, container: '#navbar' });
+});
 EOS;
         $this->getView()->plugin('inlineScript')->offsetSetScript(1000, $js);