Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

CoFlow
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5a04f5df

Commit 5a04f5df authored 6 months ago by Sandra Borst

Downloads
- Plain Diff

Merge branch 'develop' into 'distractionsFeature2'

# Conflicts:
#   InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml

parents 9d5b2f2c d44ecf83

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs 1 addition, 1 deletion

...ug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache 1 addition, 1 deletion

...-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.GeneratedMSBuildEditorConfig.editorconfig 1 addition, 1 deletion

...rojektDektopApp.GeneratedMSBuildEditorConfig.editorconfig
InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.assets.cache 0 additions, 0 deletions

...Debug/net8.0-windows/InnoLabProjektDektopApp.assets.cache

with 3 additions and 3 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