Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/config/applicationhost.config # FWA_MAIN/FWA_MAIN.csproj # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
This commit is contained in:
commit
5def2550f8
@ -155,7 +155,7 @@
|
|||||||
<virtualDirectoryDefaults allowSubDirConfig="true" />
|
<virtualDirectoryDefaults allowSubDirConfig="true" />
|
||||||
<site name="FWA_MAIN" id="1">
|
<site name="FWA_MAIN" id="1">
|
||||||
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
<application path="/" applicationPool="Clr4IntegratedAppPool">
|
||||||
<virtualDirectory path="/" physicalPath="C:\Users\cmoore\RiderProjects\FWA_MAIN\FWA_MAIN" />
|
<virtualDirectory path="/" physicalPath="C:\Users\IVAN\RiderProjects\FWA_MAIN\FWA_MAIN" />
|
||||||
</application>
|
</application>
|
||||||
<bindings>
|
<bindings>
|
||||||
<binding protocol="http" bindingInformation="*:5000:localhost" />
|
<binding protocol="http" bindingInformation="*:5000:localhost" />
|
||||||
|
@ -227,8 +227,6 @@
|
|||||||
<Content Include="patient.aspx" />
|
<Content Include="patient.aspx" />
|
||||||
<Content Include="patNew.aspx" />
|
<Content Include="patNew.aspx" />
|
||||||
<Content Include="physician.aspx" />
|
<Content Include="physician.aspx" />
|
||||||
<Content Include="preNew.aspx" />
|
|
||||||
<Content Include="Prescription.aspx" />
|
|
||||||
<Content Include="Scripts\bootstrap.js" />
|
<Content Include="Scripts\bootstrap.js" />
|
||||||
<Content Include="Scripts\bootstrap.min.js" />
|
<Content Include="Scripts\bootstrap.min.js" />
|
||||||
<Content Include="Default.aspx" />
|
<Content Include="Default.aspx" />
|
||||||
|
2
FWA_MAIN/physNew.aspx
Normal file
2
FWA_MAIN/physNew.aspx
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
<%@ Page Title="Title" Language="C#" MasterPageFile="MasterPage" CodeBehind="physNew.aspx.cs" Inherits="FWA_MAIN.physNew" %>
|
||||||
|
|
13
FWA_MAIN/physNew.aspx.cs
Normal file
13
FWA_MAIN/physNew.aspx.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
using System;
|
||||||
|
using System.Web.UI;
|
||||||
|
|
||||||
|
namespace FWA_MAIN
|
||||||
|
{
|
||||||
|
public partial class physNew : Page
|
||||||
|
{
|
||||||
|
protected void Page_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
17
FWA_MAIN/physNew.aspx.designer.cs
generated
Normal file
17
FWA_MAIN/physNew.aspx.designer.cs
generated
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// <auto-generated>
|
||||||
|
// This code was generated by a tool.
|
||||||
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
|
// the code is regenerated.
|
||||||
|
// </auto-generated>
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
namespace FWA_MAIN
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
public partial class physNew
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user