<?xml version="1.0" encoding="utf-8"?>
|
<<<<<<< Updated upstream
|
<preserve resultType="3" virtualPath="/web/Main.master" hash="fffffff0f8c188f4" filehash="6304f7db2c3071db" flags="110000" assembly="App_Web_tlwmm4hc" type="ASP.main_master">
|
=======
|
<preserve resultType="3" virtualPath="/web/Main.master" hash="fffffff0f8c188f4" filehash="60363fc5b86526bf" flags="110000" assembly="App_Web_p2jueioo" type="ASP.main_master">
|
>>>>>>> Stashed changes
|
<filedeps>
|
<filedep name="/web/Main.master" />
|
<filedep name="/web/Main.master.cs" />
|
</filedeps>
|
</preserve>
|
