aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-02 08:52:38 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-02 08:52:38 -0400
commitf61227fec0cfb9b89dca89b8fe7688d4adc8d59c (patch)
treef4667a3d455b5e95c38514b4b560173ee3c147a1
parent23a4c9af21a06bb255a9db57a5a9fc84abe3a018 (diff)
Updated ignore to exclude all *.orig
-rw-r--r--.hgignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 45c8691ee..6fd079851 100644
--- a/.hgignore
+++ b/.hgignore
@@ -23,6 +23,7 @@ syntax: glob
*.scc
*.psess
*.vsp
+*.orig
[Bb]in
[Dd]ebug*/
obj/
@@ -38,4 +39,3 @@ _ReSharper*/
# ncrunch files
*.ncrunchsolution
*.ncrunchproject
-MediaBrowser.Common/Kernel/BaseKernel.cs.orig