Compare commits

..

No commits in common. "4a8dc0e470c4bcf962bfdf99972c62ded2c8ac40" and "4a65d6aaf2524b038c29cf900251ac14db8c08a2" have entirely different histories.

View file

@ -17,22 +17,13 @@ Name=Penelope
IsRelative=1 IsRelative=1
Path=penelope Path=penelope
Default=1 Default=1
<<<<<<< HEAD
StoreID=bf331188
=======
StoreID=0585997e StoreID=0585997e
>>>>>>> 4a65d6aaf2524b038c29cf900251ac14db8c08a2
ShowSelector=0 ShowSelector=0
[General] [General]
StartWithLastProfile=1 StartWithLastProfile=1
Version=2 Version=2
[Profile4]
Name=testing
IsRelative=1
Path=4z689ygf.testing
[Install6C4726F70D182CF7] [Install6C4726F70D182CF7]
Default=penelope Default=penelope
Locked=1 Locked=1
@ -42,3 +33,8 @@ Name=School
IsRelative=1 IsRelative=1
Path=school Path=school
[Profile4]
Name=testing
IsRelative=1
Path=4z689ygf.testing