From b6360eba261362831cff5bdff641cd79fc2c28f6 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 11 Oct 2011 00:14:46 -0700 Subject: [PATCH] orig file are added to .gitignore --- .gitignore | 3 +- NzbDrone/NzbDrone.csproj.orig | 154 ---------------------------------- 2 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 NzbDrone/NzbDrone.csproj.orig diff --git a/.gitignore b/.gitignore index acbce3bc6..dc442bdbe 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ _ReSharper*/ *Web.Publish.xml NzbDrone.Web/NzbDrone.Web.Publish.xml *.sdf -[Bb]anners \ No newline at end of file +[Bb]anners +*.orig \ No newline at end of file diff --git a/NzbDrone/NzbDrone.csproj.orig b/NzbDrone/NzbDrone.csproj.orig deleted file mode 100644 index 2f3a2bcbb..000000000 --- a/NzbDrone/NzbDrone.csproj.orig +++ /dev/null @@ -1,154 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - Exe - Properties - NzbDrone - NzbDrone - v4.0 - 512 - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - BasicCorrectnessRules.ruleset - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - NzbDrone.ico - - - - True - - - True - - - True - - - False - ..\Libraries\Exceptioneer.WindowsFormsClient.dll - - - ..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll - - - False - ..\Libraries\NLog.dll - - - - - - - - - - - - - -<<<<<<< HEAD - -======= - ->>>>>>> markus - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - - - - - - \ No newline at end of file