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