fixed some merge bugs

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

@@ -41,19 +41,13 @@ 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/router.js

@@ -13,12 +13,11 @@ var StartPage = require('./components/startPage/startPage');
 var ByCategory = require('./components/browsing/byCategory');
 var BySection = require('./components/browsing/bySection');
 
-var ItemPage = require('./components/items/itemPage');
 
 var routes = (
     <Route name='app' path='/' handler={RootApp}>
       <Route name='sekcija' path='sekcija/:id/:name' handler={BySection} />
-      <Route name='artikal' path="artikal/:id/*" handler={ItemPage} />
+      <Route name='artikal' path="artikal/:id/*" handler={ItemWithDetailsPage} />
       <Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
       <DefaultRoute handler={StartPage}/>
     </Route>