Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Project
- Activity
- Members
- Labels
- Wiki
- Environments
- Terraform modules

Snippets Groups Projects

Admin message

Aufgrund einer Wartung am 24.06.2025 von 8:00 bis 09:00 Uhr werden git.rwth-aachen.de & git-ce.rwth-aachen.de zeitweise nicht zur Verfügung stehen.

--

Due to maintenance at 24.06.2025 from 8:00 to 09:00, git.rwth-aachen.de & git-ce.rwth-aachen.de will be temporarily unavailable.

This is an archived project. Repository and other project resources are read-only.

293087ea

Commit 293087ea authored 4 years ago by Marcel Nellesen

Downloads
- Plain Diff

Merge branch 'Hotfix/1308-versionConflict' into 'Sprint/2021-02'

Hotfix/1308 version conflict

See merge request !125

parents 6bbe70ea fdbfcdbf

Branches

No related tags found

2 merge requests!125Hotfix/1308 version conflict,!124Sprint/2021 02

Changes 7
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

src/Project.Tests/Project.Tests.csproj 4 additions, 4 deletions

src/Project.Tests/Project.Tests.csproj
src/Project.Tests/app.config 5 additions, 1 deletion

src/Project.Tests/app.config
src/Project.Tests/packages.config 2 additions, 2 deletions

src/Project.Tests/packages.config
src/Project/App.config 5 additions, 1 deletion

src/Project/App.config
src/Project/Controllers/ProjectController.cs 2 additions, 4 deletions

src/Project/Controllers/ProjectController.cs
src/Project/Project.csproj 4 additions, 4 deletions

src/Project/Project.csproj
src/Project/packages.config 2 additions, 2 deletions

src/Project/packages.config

with 24 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment