diff --git a/400-SOURCECODE/AIAHTML5.Web/Web.config.orig b/400-SOURCECODE/AIAHTML5.Web/Web.config.orig deleted file mode 100644 index 5c3b0dc..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/Web.config.orig +++ /dev/null @@ -1,84 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - - -======= - - ->>>>>>> 98e905fcd7730a4ac9a42c79fa962809bae7bc88 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file