1

d71931a9 · wildfirecode · 1cac815a · 1cac815a
Commit d71931a9 authored Aug 29, 2019 by wildfirecode
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

preload.tmproject egret/resource/TextureMerger/preload.tmproject +0 -5

No files found.
--- a/egret/resource/TextureMerger/preload.tmproject
+++ b/egret/resource/TextureMerger/preload.tmproject
-<<<<<<< HEAD
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\common\\prizePanelbg.png"]}
-=======
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/common/prizePanelbg.png"]}
->>>>>>> 983aa8d0e137ab6ac947ff8d15f79d5e2a402b74