Skip to content
Snippets Groups Projects
Commit 5a04f5df authored by Sandra Borst's avatar Sandra Borst
Browse files

Merge branch 'develop' into 'distractionsFeature2'

# Conflicts:
#   InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
parents 9d5b2f2c d44ecf83
No related branches found
No related tags found
1 merge request!9Distractionssss test2
...@@ -14,7 +14,7 @@ using System.Reflection; ...@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("InnoLabProjektDektopApp")] [assembly: System.Reflection.AssemblyCompanyAttribute("InnoLabProjektDektopApp")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+86eca7696b524bd262803ac3c3d606a20ac48a00")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bc5d4e9feb49a3de6bcdf6872bf1658a8be5d88b")]
[assembly: System.Reflection.AssemblyProductAttribute("InnoLabProjektDektopApp")] [assembly: System.Reflection.AssemblyProductAttribute("InnoLabProjektDektopApp")]
[assembly: System.Reflection.AssemblyTitleAttribute("InnoLabProjektDektopApp")] [assembly: System.Reflection.AssemblyTitleAttribute("InnoLabProjektDektopApp")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
......
9c06ef33bb4cbc9c1838367faad4937a5fa83c13d3aad39650d61c6ce774d63f ec21d6356845febc33d682f0972d3e86147490e6edef0e6a27685cbc8f024771
...@@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = ...@@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = InnoLabProjektDektopApp build_property.RootNamespace = InnoLabProjektDektopApp
build_property.ProjectDir = C:\Users\Sandra\Source\Repos\procrastinator\InnoLabProjektDektopApp\InnoLabProjektDektopApp\ build_property.ProjectDir = D:\Studium\7. Semester\InnoLab\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\
build_property.EnableComHosting = build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment