resolve merge conflicts: keep theirs for all binary files

dytyqx

2 天以前 ba927b1faad68ab38d053ee9ea9eeac4b1a5531b

1
2
3
4
5
6
7
8
9
10
11
12
13
using System.Web;
using System.Web.Mvc;
 
namespace WebAPI
{
    public class FilterConfig
    {
        public static void RegisterGlobalFilters(GlobalFilterCollection filters)
        {
            filters.Add(new HandleErrorAttribute());
        }
    }
}