Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 07:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge error.

Browse source
This commit is contained in:
NissimHadar 2019-01-22 14:14:27 -08:00
parent a51e446b77
commit 9e3220737c
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -104,10 +104,6 @@ tools/unity-avatar-exporter/Logs
tools/unity-avatar-exporter/Packages tools/unity-avatar-exporter/Packages
tools/unity-avatar-exporter/ProjectSettings tools/unity-avatar-exporter/ProjectSettings
tools/unity-avatar-exporter/Temp tools/unity-avatar-exporter/Temp
<<<<<<< HEAD
=======
server-console/package-lock.json server-console/package-lock.json
vcpkg/ vcpkg/
/tools/nitpick/compiledResources /tools/nitpick/compiledResources
>>>>>>> c199654ded854157b9d11b6ede1b867b46356102