resolve merge conflict
This commit is contained in:
commit
0365e95339
2 changed files with 4 additions and 4 deletions
|
|
@ -173,10 +173,10 @@ SetEditor=false
|
||||||
1920x1200 screen: Width=855
|
1920x1200 screen: Width=855
|
||||||
2 screens: Height=1119
|
2 screens: Height=1119
|
||||||
2 screens: Width=490
|
2 screens: Width=490
|
||||||
2048x1280 screen: Height=1030
|
2048x1280 screen: Height=1199
|
||||||
2048x1280 screen: Width=1005
|
2048x1280 screen: Width=1005
|
||||||
3 screens: Height=672
|
3 screens: Height=1369
|
||||||
3 screens: Width=1056
|
3 screens: Width=1295
|
||||||
|
|
||||||
[filetree]
|
[filetree]
|
||||||
editShade=183,220,246
|
editShade=183,220,246
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ Locked=1
|
||||||
Name=Development
|
Name=Development
|
||||||
IsRelative=1
|
IsRelative=1
|
||||||
Path=development
|
Path=development
|
||||||
StoreID=2ccf13ae
|
StoreID=30267575
|
||||||
ShowSelector=1
|
ShowSelector=1
|
||||||
|
|
||||||
[Profile0]
|
[Profile0]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue