Fixed confilicts

PatrickHollweck · May 1, 2017 · 694bc15 · 694bc15
2 parents ca7829b + 304e036
commit 694bc15
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/public/versions/updaterInfo.xml b/public/versions/updaterInfo.xml
@@ -3,4 +3,4 @@
     <version>1.0.0.0</version>
     <url>https://github.com/FetzenRndy/AstroSoundboard/raw/master/public/versions/AstroKittySoundBoard.zip</url>
     <changelog>https://raw.githubusercontent.com/FetzenRndy/AstroSoundboard/master/public/versions/releaseNotes.html</changelog>
-</item>
+</item>
diff --git a/public/versions/AstroKittySoundBoard.zip → public/versions/v1/AstroKittySoundBoard.zip b/public/versions/AstroKittySoundBoard.zip → public/versions/v1/AstroKittySoundBoard.zip
diff --git a/public/versions/releaseNotes.html → public/versions/v1/releaseNotes.html b/public/versions/releaseNotes.html → public/versions/v1/releaseNotes.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>

diff --git a/src/AstroSoundBoard/Properties/AssemblyInfo.cs b/src/AstroSoundBoard/Properties/AssemblyInfo.cs
@@ -1,8 +1,8 @@
 // ****************************** Module Header ****************************** //
 //
 //
-// Last Modified: 23:04:2017 / 16:49
-// Creation: 23:04:2017
+// Last Modified: 01:05:2017 / 15:59
+// Creation: 01:05:2017
 // Project: AstroSoundBoard
 //
 //
@@ -31,8 +31,8 @@
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
 // VERSION
-[assembly: AssemblyVersion("0.9.0")]
-[assembly: AssemblyFileVersion("0.9.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
 
 // LOG4NET
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]

diff --git a/src/AstroSoundBoard/WPF/Windows/MainWindow.xaml.cs b/src/AstroSoundBoard/WPF/Windows/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 // ****************************** Module Header ****************************** //
 //
 //
-// Last Modified: 01:05:2017 / 13:22
+// Last Modified: 01:05:2017 / 15:41
 // Creation: 01:05:2017
 // Project: AstroSoundBoard
 //
@@ -35,7 +35,7 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             AutoUpdater.CurrentCulture = CultureInfo.CreateSpecificCulture("en");
-            AutoUpdater.Start("https://raw.githubusercontent.com/FetzenRndy/AstroSoundboard/develop/public/versions/updaterInfo.xml");
+            AutoUpdater.Start("https://raw.githubusercontent.com/FetzenRndy/AstroSoundboard/master/public/versions/updaterInfo.xml");
 
             ViewChanger.MainWindowInstance = this;
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    <!DOCTYPE html>
     <html>
     <head>
@@ Expand Down @@