remove sha

andrewseguin · andrewseguin · commit ac2f572a8ff1 · 2016-12-21T14:24:51.000-08:00
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

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,6 @@ export class ConnectedPositionStrategy implements PositionStrategy {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`/**`
`143`		`- <<<<<<< b07c918b15021de7b9b5af2928d994203174cbe7`
`144`	`143`	`* Adds a new preferred fallback position.`
`145`	`144`	`* @param originPos`
`146`	`145`	`* @param overlayPos`