From 1445e8f702bd6fbf810466e78a3e5656b5027d34 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Wed, 28 Jan 2015 05:09:53 +0100
Subject: [PATCH] fixed some merge bugs

---
 front-ui/app/components/items/itemWithDetailsPage.js | 10 ++--------
 front-ui/app/router.js                               |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/front-ui/app/components/items/itemWithDetailsPage.js b/front-ui/app/components/items/itemWithDetailsPage.js
index 3ca3cf8..e76b653 100644
--- a/front-ui/app/components/items/itemWithDetailsPage.js
+++ b/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 () {
diff --git a/front-ui/app/router.js b/front-ui/app/router.js
index 06b0e48..c99c628 100644
--- a/front-ui/app/router.js
+++ b/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>