search

JakeHam / TheVirtualCloset

Development of The Virtual Closet
0 stars 0 forks source link

Storedata #22

Closed Donnacaihahaha closed 7 years ago

JakeHam commented 7 years ago

Looks like there's still one merge conflict.

Donnacaihahaha commented 7 years ago

can i accept master's change here? i tried but it does not solve the conflict