aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Main/Properties
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-11-17 20:29:46 -0700
committerAShifter <[email protected]>2017-11-17 20:29:46 -0700
commitebdc09fe679b4b06fd149c8fc6539244100ce896 (patch)
tree65dfe45bbfd194ddb534cc80107ab8e6d80cf5bc /ShiftOS.Main/Properties
parent1d0b393e6969d9671daead8049973a374421046f (diff)
parent97722fbe9d474adffbba0b92e9727c48a8205234 (diff)
downloadshiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.tar.gz
shiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.tar.bz2
shiftos-rewind-ebdc09fe679b4b06fd149c8fc6539244100ce896.zip
Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'
Diffstat (limited to 'ShiftOS.Main/Properties')
-rw-r--r--ShiftOS.Main/Properties/AssemblyInfo.cs3
-rw-r--r--ShiftOS.Main/Properties/Settings.settings3
2 files changed, 3 insertions, 3 deletions
diff --git a/ShiftOS.Main/Properties/AssemblyInfo.cs b/ShiftOS.Main/Properties/AssemblyInfo.cs
index 6f85581..bcab0d6 100644
--- a/ShiftOS.Main/Properties/AssemblyInfo.cs
+++ b/ShiftOS.Main/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@@ -33,4 +32,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file
diff --git a/ShiftOS.Main/Properties/Settings.settings b/ShiftOS.Main/Properties/Settings.settings
index 3964565..e04fc63 100644
--- a/ShiftOS.Main/Properties/Settings.settings
+++ b/ShiftOS.Main/Properties/Settings.settings
@@ -1,7 +1,8 @@
<?xml version='1.0' encoding='utf-8'?>
+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
-</SettingsFile>
+</SettingsFile> \ No newline at end of file