@@ -37,4 +37,5 @@ _ReSharper*/
# ncrunch files
*.ncrunchsolution
-*.ncrunchproject
+*.ncrunchproject
+MediaBrowser.Common/Kernel/BaseKernel.cs.orig
LukePulverenti Luke Pulverenti luke pulverenti