From 6aeeca89f3621ef17116f355923d2e0560a4a56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 18 Sep 2018 11:32:56 +0200 Subject: [PATCH] resolve merge conflicts --- scm-ui/src/repos/containers/RepositoryRoot.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index 2f72275120..3368d94bb3 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -7,15 +7,9 @@ import { getRepository, isFetchRepoPending } from "../modules/repos"; -<<<<<<< working copy import { connect } from "react-redux"; import { Route, Switch } from "react-router-dom"; import type { Repository } from "@scm-manager/ui-types"; -======= -import {connect} from "react-redux"; -import {Route} from "react-router-dom"; -import type {Repository} from "@scm-manager/ui-types"; ->>>>>>> merge rev import { Page, Loading, @@ -31,11 +25,8 @@ import Edit from "../containers/Edit"; import type {History} from "history"; import EditNavLink from "../components/EditNavLink"; -<<<<<<< working copy import ChangesetView from "../changesets/containers/ChangesetView"; -======= import Changesets from "../../changesets/containers/Changesets"; ->>>>>>> merge rev type Props = { namespace: string,