docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-11 04:02:07 +03:00
Code Activity

Fixing merges

Browse Source
This commit is contained in:
Jeffrey Morgan
2015-02-26 20:16:48 -05:00
parent 75467305df
commit d52810959a
7 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ContainerDetailsSubheader.react.js
View File

@@ -171,11 +171,7 @@ var ContainerDetailsSubheader = React.createClass({
<div className="details-subheader">
<div className="details-header-actions">
<div className={runActionClass} onMouseEnter={this.handleItemMouseEnterView} onMouseLeave={this.handleItemMouseLeaveView}>
<<<<<<< HEAD
<span className="action-icon" onClick={this.handleRun}><RetinaImage src="button-view.png"/></span>
=======
<div className="action-icon" onClick={this.handleRun}><RetinaImage src="button-view.png"/></div>
>>>>>>> master
<span className="btn-label view">View</span>
</div>
<div className={restartActionClass} onMouseEnter={this.handleItemMouseEnterRestart} onMouseLeave={this.handleItemMouseLeaveRestart}>