From decdce17fa61282122357e00add4b3af085456d0 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Tue, 19 Sep 2017 16:47:55 +0200
Subject: [PATCH] Fix rebasing problems

---
 app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx | 5 +----
 .../scenes/teams/components/TeamsPageDetails.jsx             | 2 +-
 .../scenes}/teams/new/components/NameFormControl.jsx         | 0
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename app/javascript/{packs/src/settings/components => src/scenes/SettingsPage/scenes}/teams/new/components/NameFormControl.jsx (100%)

diff --git a/app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx b/app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx
index 4ef011b13..61d5e1c02 100644
--- a/app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx
+++ b/app/javascript/src/scenes/SettingsPage/scenes/team/index.jsx
@@ -1,6 +1,5 @@
 import React, { Component } from "react";
 import ReactRouterPropTypes from "react-router-prop-types";
-import { Link } from "react-router-dom";
 import styled from "styled-components";
 import { Breadcrumb, Row, Col, Glyphicon, Well } from "react-bootstrap";
 import { LinkContainer } from "react-router-bootstrap";
@@ -10,10 +9,8 @@ import prettysize from "prettysize";
 import axios from "../../../../config/axios";
 
 import { SETTINGS_TEAMS_ROUTE } from "../../../../config/routes";
-import { TEAM_DETAILS_PATH, SETTINGS_TEAMS } from "../../../../config/api_endpoints";
+import { TEAM_DETAILS_PATH } from "../../../../config/api_endpoints";
 import { BORDER_LIGHT_COLOR } from "../../../../config/constants/colors";
-import { SETTINGS_TEAMS_ROUTE } from "../../../../app/dom_routes";
-import { TEAM_DETAILS_PATH } from "../../../../app/routes";
 
 import TeamsMembers from "./components/TeamsMembers";
 import UpdateTeamDescriptionModal from "./components/UpdateTeamDescriptionModal";
diff --git a/app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx b/app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx
index 83341dca1..36033786d 100644
--- a/app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx
+++ b/app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx
@@ -4,7 +4,7 @@ import PropTypes, { number, string, bool } from "prop-types";
 import styled from "styled-components";
 import { FormattedMessage, FormattedPlural } from "react-intl";
 import { Button, Glyphicon } from "react-bootstrap";
-import { SETTINGS_NEW_TEAM_ROUTE } from "../../../../../app/dom_routes";
+import { SETTINGS_NEW_TEAM_ROUTE } from "../../../../../config/routes";
 
 const Wrapper = styled.div`margin: 15px 0;`;
 const TeamsPageDetails = ({ teams }) => {
diff --git a/app/javascript/packs/src/settings/components/teams/new/components/NameFormControl.jsx b/app/javascript/src/scenes/SettingsPage/scenes/teams/new/components/NameFormControl.jsx
similarity index 100%
rename from app/javascript/packs/src/settings/components/teams/new/components/NameFormControl.jsx
rename to app/javascript/src/scenes/SettingsPage/scenes/teams/new/components/NameFormControl.jsx