From 72b8d6cc810e1536589400983ea1cca288dac75f Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Fri, 20 Feb 2015 15:33:26 -0800
Subject: [PATCH] Fixing merge

---
 src/ImageCard.react.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ImageCard.react.js b/src/ImageCard.react.js
index b21be450ef..2aa36a65d2 100644
--- a/src/ImageCard.react.js
+++ b/src/ImageCard.react.js
@@ -2,12 +2,9 @@ var $ = require('jquery');
 var React = require('react/addons');
 var RetinaImage = require('react-retina-image');
 var ContainerStore = require('./ContainerStore');
-<<<<<<< HEAD
 var metrics = require('./Metrics');
-=======
 var OverlayTrigger = require('react-bootstrap').OverlayTrigger;
 var Tooltip = require('react-bootstrap').Tooltip;
->>>>>>> master
 
 var ImageCard = React.createClass({
   getInitialState: function () {