# Conflicts:
#	Documents/HBuilderProjects/xm/.gitignore
UserInfo^2
MINAMI 2 days ago
commit c6b69d0b61

@ -21,4 +21,8 @@ dist-ssr
*.ntvs* *.ntvs*
*.njsproj *.njsproj
*.sln *.sln
<<<<<<< HEAD
*.sw? *.sw?
=======
*.sw?
>>>>>>> 42d0eec2c04687bfcd07b428945c72601bc08cf5

Loading…
Cancel
Save