tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-20 07:38:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged develop and stolen binarymash dont publish unstable build script code

Browse Source
This commit is contained in:
TomPallister
2017-02-25 18:27:20 +00:00
parent c2f98f0d69 040f2daae0
commit d33e0c6f3b
46 changed files with 2985 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/Ocelot.AcceptanceTests/TestConfiguration.cs.orig Normal file
View File

@ -0,0 +1,17 @@
using System;
<<<<<<< HEAD
=======
using System.IO;
>>>>>>> develop
namespace Ocelot.AcceptanceTests
{
public static class TestConfiguration
{
<<<<<<< HEAD
public static string ConfigurationPath => $"{AppContext.BaseDirectory}/configuration.json";
=======
public static string ConfigurationPath => Path.Combine(AppContext.BaseDirectory, "configuration.json");
>>>>>>> develop
}
}