resolve merge issue

lithnet · Nov 28, 2021 · 3f37daa · 3f37daa
2 parents 90359e1 + c28e3f9
commit 3f37daa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Lithnet.Miiserver.AutoSync.Setup/Lithnet.Miiserver.AutoSync.Setup.wixproj b/src/Lithnet.Miiserver.AutoSync.Setup/Lithnet.Miiserver.AutoSync.Setup.wixproj
@@ -108,11 +108,11 @@
     <PostBuildEvent>call %25BuildToolsPath%25\sign.bat $(TargetPath) $(TargetDir) $(ProjectName)</PostBuildEvent>
   </PropertyGroup>
   <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
+    To modify your build process, add your task inside one of the targets below and uncomment it.
+    Other similar extension points exist, see Wix.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
 </Project>
diff --git a/src/Lithnet.Miiserver.AutoSync/Program.cs b/src/Lithnet.Miiserver.AutoSync/Program.cs
@@ -312,7 +312,7 @@ private static void ShutdownExecutionEngineInstance()
 #if DEBUG
         public static void SetupOutOfBandInstance()
         {
-            LogManager.Configuration = new XmlLoggingConfiguration(@"D:\github\lithnet\miis-autosync\src\Lithnet.Miiserver.AutoSync\bin\Debug\Lithnet.Miiserver.AutoSync.exe.config");
+            LogManager.Configuration = new XmlLoggingConfiguration(@"D:\dev\git\lithnet\miis-autosync\src\Lithnet.Miiserver.AutoSync\bin\Debug\Lithnet.Miiserver.AutoSync.exe.config");
 
             foreach (LoggingRule item in LogManager.Configuration.LoggingRules.Where(t => t.Targets.Any(u => u.Name == "autosync-service-file")))
             {