aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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