senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixedconflict

Browse Source
This commit is contained in:
Senad Uka
2015-01-28 05:05:52 +01:00
parent f8b3ef3a64 f0f25b10c0
commit c35d8a57de
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
front-ui/app/components/items/itemWithDetailsPage.js
View File

@@ -41,11 +41,19 @@ var ItemWithDetailsPage = React.createClass({
}, },
_onChange: function () { _onChange: function () {
<<<<<<< HEAD
if (this.isMounted()) { if (this.isMounted()) {
this.setState({ this.setState({
item: ItemStore.getLoadedItemWithDetails() item: ItemStore.getLoadedItemWithDetails()
}); });
} }
=======
if(this.isMounted()) {
this.setState({
item: ItemStore.getSelectedItem()
});
}
>>>>>>> f0f25b10c0e909df4f366e132f46834a56493e8d
}, },
getInitialState: function () { getInitialState: function () {

2
front-ui/app/ribica.js
View File

@@ -10,5 +10,5 @@ Router.run(function(Handler, state) {
module.exports = { module.exports = {
App: ExternalApi, App: ExternalApi,
Router: Routes Router: Router
} }