<?xml version="1.0" encoding="utf-8"?>
|
<<<<<<< Updated upstream
|
<preserve resultType="3" virtualPath="/web/api.aspx" hash="fffffff0f8c188f4" filehash="a0f12c9cf0cdd4df" flags="110000" assembly="App_Web_tlwmm4hc" type="ASP.api_aspx">
|
=======
|
<preserve resultType="3" virtualPath="/web/api.aspx" hash="fffffff0f8c188f4" filehash="5c9514b13ca750fa" flags="110000" assembly="App_Web_p2jueioo" type="ASP.api_aspx">
|
>>>>>>> Stashed changes
|
<filedeps>
|
<filedep name="/web/api.aspx" />
|
<filedep name="/web/api.aspx.cs" />
|
</filedeps>
|
</preserve>
|
