Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 02:25:53 +01:00
Code Issues Packages Projects Releases Activity

fixed smaller merge issues

Browse Source
This commit is contained in:
Florian Scholdei
2019-02-01 13:51:14 +01:00
parent 704ef72e03
commit a09698d526
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,13 +33,8 @@ import ChangesetView from "./ChangesetView";
import PermissionsNavLink from "../components/PermissionsNavLink";
import Sources from "../sources/containers/Sources";
import RepositoryNavLink from "../components/RepositoryNavLink";
<<<<<<< working copy
import { getRepositoriesLink } from "../../modules/indexResource";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
=======
import {getLinks, getRepositoriesLink} from "../../modules/indexResource";
import {ExtensionPoint} from "@scm-manager/ui-extensions";
>>>>>>> merge rev
type Props = {
namespace: string,