local and dev manual merge, cont.

sails/src/assets/scripts/modules/student/views/session.html

@@ -44,15 +44,9 @@
           </timer>
           </timer>
         </div>
         </div>
         <div class="try">
         <div class="try">
-<<<<<<< HEAD
           <div class="pull-left" ng-repeat="a in actual_try.actions track by $index"> 
           <div class="pull-left" ng-repeat="a in actual_try.actions track by $index"> 
             <div   ng-if="a.action != 'initsession'" class="picto" popover="{{ a.attributes.stu_picto.expression.text | translate }}" popover-trigger="mouseenter">
             <div   ng-if="a.action != 'initsession'" class="picto" popover="{{ a.attributes.stu_picto.expression.text | translate }}" popover-trigger="mouseenter">
               <img ng-src="{{  a.attributes.stu_picto.picto.uri }}"  style="{{a.attributes.id_sup!=null ? 'border:2px dotted red': ''}}"/>
               <img ng-src="{{  a.attributes.stu_picto.picto.uri }}"  style="{{a.attributes.id_sup!=null ? 'border:2px dotted red': ''}}"/>
-=======
-          <div class="pull-left" ng-repeat="a in actual_try.actions track by $index">
-            <div class="picto" popover="{{ a.attributes.stu_picto.expression.text | translate }}" popover-trigger="mouseenter">
-              <img ng-src="{{  a.attributes.stu_picto.picto.uri }}" />
->>>>>>> 13f9c9bff4582a0d96036c25304bf8bc2056587a
               <div class="action-type">
               <div class="action-type">
                 <span ng-if="a.action == 'Add'"  aria-hidden="true"></span>
                 <span ng-if="a.action == 'Add'"  aria-hidden="true"></span>
                 <span ng-if="a.action == 'Select'"  aria-hidden="true"></span>
                 <span ng-if="a.action == 'Select'"  aria-hidden="true"></span>