Fix merge conflict in preparation to integrate nasa/openmctweb#47 Conflicts: platform/commonUI/browse/res/templates/browse/object-header.html
Directives
mct-scroll-xis an attribute whose value is an assignable Angular expression. This two-way binds that expression to the horizontal scroll state of the element on which it is applied.mct-scroll-yis an attribute whose value is an assignable Angular expression. This two-way binds that expression to the vertical scroll state of the element on which it is applied.