fixedconflict

front-ui/app/components/items/itemWithDetailsPage.js

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

front-ui/app/ribica.js

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