<?xml version="1.0" encoding="utf-8"?>
|
<<<<<<< Updated upstream
|
<preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="821a1ec5afbea06d" flags="110000" assembly="App_Web_oibi53em" type="ASP.error_aspx">
|
=======
|
<preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="3ab940e557f2526a" flags="110000" assembly="App_Web_fx5xac0k" type="ASP.error_aspx">
|
>>>>>>> Stashed changes
|
<filedeps>
|
<filedep name="/web/Error.aspx" />
|
<filedep name="/web/Error.aspx.cs" />
|
<filedep name="/web/Main.master" />
|
<filedep name="/web/Main.master.cs" />
|
</filedeps>
|
</preserve>
|
