☰

Updated Webforms Basic Integration (markdown)

Michael Hornaday committed 2016-03-09 10:12:22 -0500 commit 7028fd4b2fdcdf631829803dee488a8c21eeda64

				Guides/Webforms-Basic-Integration.md
			
          @@ -55,7 +55,7 @@ You will get a conflict around the NewtonJSON DLL and its' XML configuration fil

           You'll see conflicts for four files:

          -* Global.asax -This crucial to merge as it contains Izenda's CustomAdHocConfig class and InitializeReporting() method.

          +* Global.asax -This is crucial to merge as it contains Izenda's CustomAdHocConfig class and InitializeReporting() method.

           * Web.Config - This will contain basic web application configuration settings.

           * Default.aspx - This file is simply a placeholder in Izenda. It redirects users to the ReportList page.

           * Default.aspx.cs - This is the code file for the above page. It redirects users to the ReportList page.

...	...	@@ -55,7 +55,7 @@ You will get a conflict around the NewtonJSON DLL and its' XML configuration fil
55	55
56	56	You'll see conflicts for four files:
57	57
58		-* Global.asax -This crucial to merge as it contains Izenda's CustomAdHocConfig class and InitializeReporting() method.
	58	+* Global.asax -This is crucial to merge as it contains Izenda's CustomAdHocConfig class and InitializeReporting() method.
59	59	* Web.Config - This will contain basic web application configuration settings.
60	60	* Default.aspx - This file is simply a placeholder in Izenda. It redirects users to the ReportList page.
61	61	* Default.aspx.cs - This is the code file for the above page. It redirects users to the ReportList page.