Conflicts: ChangeLog ITContentProvider/ChangeLog Makefile NpgsqlBlogProvider/ChangeLog NpgsqlContentProvider/ChangeLog NpgsqlMRPProviders/ChangeLog TestAPI/ChangeLog web/App_Themes/style.css web/ChangeLog web/Helpers/YavscHelpers.cs web/Models/App.master web/Views/Blogs/UserPosts.aspx |
||
|---|---|---|
| .. | ||
| Properties | ||
| packages.config | ||
| TestAPI.csproj | ||
| TestAutomate.cs | ||