TerribleDev/Varanus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mergeconflics and removing a userfile

Browse Source
This commit is contained in:
Norm MacLennan
2014-05-07 16:05:12 -07:00
parent c9803e3f68 e5ed166572
commit ec4dbe486a
8 changed files with 81 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NOCQ/NOCQ.csproj
View File

@@ -67,16 +67,17 @@
<Compile Include="Plugins\Email\EmailSettings.cs" />
<Compile Include="Imports\IDataImportHook.cs" />
<Compile Include="Imports\DataImports.cs" />
<Compile Include="DB\RedisDataase.cs" />
<Compile Include="Plugins\Email\ParseRule.cs" />
<Compile Include="Plugins\Email\ImapInput.cs" />
<Compile Include="Plugins\Email\IEmailSetting.cs" />
<Compile Include="Plugins\Email\ImapInput.cs">
<DependentUpon>EmailSettings.cs</DependentUpon>
</Compile>
<Compile Include="Model\Alert.cs" />
<Compile Include="DB\RedisQueues.cs" />
<Compile Include="Settings\SettingsFIle.cs" />
<Compile Include="Settings\RedisSettings.cs" />
<Compile Include="Settings\SettingsParser.cs" />
<Compile Include="Settings\PluginSettings.cs" />
<Compile Include="DB\RedisDatabase.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>