docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing merge

This commit is contained in:
Jeffrey Morgan 2015-02-20 15:33:26 -08:00
parent 15328fa260
commit 72b8d6cc81
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ImageCard.react.js
View File

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