oops i suck at rebasing

Author: vintik

components/utilities/dialog/index.jsx

@@ -254,14 +254,9 @@ const Dialog = createReactClass({
 		const nubbinOffsets = this.props.hasNubbin ?
 			getNubbinMargins(this.state.popperData, this.props.align) : { left: 0, top: 0 };
 
-<<<<<<< HEAD
-		const left = `${popperData.offsets.popper.left + propOffsets.horizontal}px`;
-		const top = `${popperData.offsets.popper.top + propOffsets.vertical}px`;
-		// A Dropdown with overflowBoundaryElement position and 'align=right' uses max-width instead of inherited children width
-=======
 		const left = popperData.offsets.popper.left + nubbinOffsets.left + propOffsets.horizontal;
 		const top = popperData.offsets.popper.top + nubbinOffsets.top + propOffsets.vertical;
->>>>>>> WIP
+		// A Dropdown with overflowBoundaryElement position and 'align=right' uses max-width instead of inherited children width
 		const right = 'inherit';
 		return { ...popperData.style, left, top, right, position };
 	},