remove sha

angular · Dec 21, 2016 · 77bb07e · 77bb07e
1 parent 24a6edf
commit 77bb07e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/lib/core/overlay/position/connected-position-strategy.ts b/src/lib/core/overlay/position/connected-position-strategy.ts
@@ -140,7 +140,6 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   }
 
   /**
-   <<<<<<< b07c918b15021de7b9b5af2928d994203174cbe7
    * Adds a new preferred fallback position.
    * @param originPos
    * @param overlayPos