web/web/Bin/Release/Publish/bin/session.ashx.cdcab7d2.compiled
@@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <<<<<<< Updated upstream <preserve resultType="2" virtualPath="/web/Session.ashx" hash="ffffffff89671860" filehash="ffffecee089ef0a9" flags="110000" assembly="App_Web_tlwmm4hc" type="Session"> ======= <preserve resultType="2" virtualPath="/web/Session.ashx" hash="ffffffff89671860" filehash="1e5446362d16" flags="110000" assembly="App_Web_p2jueioo" type="Session"> >>>>>>> Stashed changes <filedeps> <filedep name="/web/Session.ashx" /> </filedeps>