diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
| commit | a8bf32646b66951eef7f2e8477d83d4d3f013a87 (patch) | |
| tree | 2659eea01895a4077c743aed399aff5631ba9b46 /TimeHACK.Engine | |
| parent | e557e46076e0fe44fb03633665ae40c7d7444461 (diff) | |
| parent | 93c445239c7d28a6cee7147d7b6dbe3c7f0974f9 (diff) | |
| download | histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.gz histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.bz2 histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.zip | |
Trying to fix the conflicts
Diffstat (limited to 'TimeHACK.Engine')
| -rw-r--r-- | TimeHACK.Engine/MessageParser.cs (renamed from TimeHACK.Engine/WCMessageParser.cs) | 2 | ||||
| -rw-r--r-- | TimeHACK.Engine/TimeHACK.Engine.csproj | 2 | ||||
| -rw-r--r-- | TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/MessageParser.cs index ef7efd0..168ab8d 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/MessageParser.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TimeHACK.Engine { - public class WCMessageParser + public class MessageParser { public string ParseMessage(string json, int index, string user) { diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 8755faf..f110aaa 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -73,7 +73,7 @@ <DependentUpon>WinClassic.cs</DependentUpon> </Compile> <Compile Include="WindowManager.cs" /> - <Compile Include="WCMessageParser.cs" /> + <Compile Include="MessageParser.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> diff --git a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache new file mode 100644 index 0000000..fbbd8f0 --- /dev/null +++ b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache @@ -0,0 +1 @@ +7aea260e995a5c8b26639269dc8e3704ae145c65 |