Fixed Merge and added back some merge changes #story[1196]

This commit is contained in:
Fan-Wu Yang
2017-09-12 22:10:13 +12:00
parent bae428fb3f
commit 3a6070a645
3 changed files with 29 additions and 5 deletions
+3
View File
@@ -0,0 +1,3 @@
<component name="CopyrightManager">
<settings default="" />
</component>