ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-03 10:25:08 +01:00
Code Issues Releases Wiki Activity

quick fix

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-06-05 16:23:16 +02:00
parent 95f4efa92d
commit 851d42e1d9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/edition_container.js
View File

@ -51,12 +51,8 @@ let EditionContainer = React.createClass({
<Edition <Edition
edition={this.state.edition} edition={this.state.edition}
currentUser={this.state.currentUser} currentUser={this.state.currentUser}
<<<<<<< HEAD
deleteEdition={this.deleteEdition}/>
=======
deleteEdition={this.deleteEdition} deleteEdition={this.deleteEdition}
savePersonalNote={this.savePersonalNote}/> savePersonalNote={this.savePersonalNote}/>
>>>>>>> AD-43-in-piece_detail-add-generic-field-
); );
} else { } else {
return ( return (