Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-30 18:15:52 +01:00
Code Issues Packages Projects Releases Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Maren Süwer
2018-09-18 11:32:56 +02:00
parent 7759d91ed2
commit 6aeeca89f3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -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,