Author: brett Date: Mon Aug 22 08:52:31 2011 New Revision: 1160149 URL: http://svn.apache.org/viewvc?rev=1160149&view=rev Log: final line endings changes
Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master (contents, props changed) incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master (contents, props changed) Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master?rev=1160149&r1=1160148&r2=1160149&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master Mon Aug 22 08:52:31 2011 @@ -1,59 +1,59 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> - -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head runat="server"> - <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title> - <link href="../../Content/Site.css" rel="stylesheet" type="text/css" /> -</head> - -<body> - <div class="page"> - - <div id="header"> - <div id="title"> - <h1>My MVC Application</h1> - </div> - - <div id="logindisplay"> - <% Html.RenderPartial("LogOnUserControl"); %> - </div> - - <div id="menucontainer"> - - <ul id="menu"> - <li><%= Html.ActionLink("Home", "Index", "Home")%></li> - <li><%= Html.ActionLink("About", "About", "Home")%></li> - </ul> - - </div> - </div> - - <div id="main"> - <asp:ContentPlaceHolder ID="MainContent" runat="server" /> - - <div id="footer"> - </div> - </div> - </div> -</body> -</html> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head runat="server"> + <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title> + <link href="../../Content/Site.css" rel="stylesheet" type="text/css" /> +</head> + +<body> + <div class="page"> + + <div id="header"> + <div id="title"> + <h1>My MVC Application</h1> + </div> + + <div id="logindisplay"> + <% Html.RenderPartial("LogOnUserControl"); %> + </div> + + <div id="menucontainer"> + + <ul id="menu"> + <li><%= Html.ActionLink("Home", "Index", "Home")%></li> + <li><%= Html.ActionLink("About", "About", "Home")%></li> + </ul> + + </div> + </div> + + <div id="main"> + <asp:ContentPlaceHolder ID="MainContent" runat="server" /> + + <div id="footer"> + </div> + </div> + </div> +</body> +</html> Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_196_MvcSupportTest/NPanday11480/Views/Shared/Site.Master ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master?rev=1160149&r1=1160148&r2=1160149&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master Mon Aug 22 08:52:31 2011 @@ -1,58 +1,58 @@ -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> - -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head runat="server"> - <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title> - <link href="../../Content/Site.css" rel="stylesheet" type="text/css" /> -</head> - -<body> - <div class="page"> - - <div id="header"> - <div id="title"> - <h1>My MVC Application</h1> - </div> - - <div id="logindisplay"> - <% Html.RenderPartial("LogOnUserControl"); %> - </div> - - <div id="menucontainer"> - - <ul id="menu"> - <li><%: Html.ActionLink("Home", "Index", "Home")%></li> - <li><%: Html.ActionLink("About", "About", "Home")%></li> - </ul> - - </div> - </div> - - <div id="main"> - <asp:ContentPlaceHolder ID="MainContent" runat="server" /> - - <div id="footer"> - </div> - </div> - </div> -</body> -</html> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head runat="server"> + <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title> + <link href="../../Content/Site.css" rel="stylesheet" type="text/css" /> +</head> + +<body> + <div class="page"> + + <div id="header"> + <div id="title"> + <h1>My MVC Application</h1> + </div> + + <div id="logindisplay"> + <% Html.RenderPartial("LogOnUserControl"); %> + </div> + + <div id="menucontainer"> + + <ul id="menu"> + <li><%: Html.ActionLink("Home", "Index", "Home")%></li> + <li><%: Html.ActionLink("About", "About", "Home")%></li> + </ul> + + </div> + </div> + + <div id="main"> + <asp:ContentPlaceHolder ID="MainContent" runat="server" /> + + <div id="footer"> + </div> + </div> + </div> +</body> +</html> Propchange: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_330_VS2010MvcProjectSupportTest/NPanday330MVC2010ProjectTest/Views/Shared/Site.Master ------------------------------------------------------------------------------ svn:eol-style = native