Fix compilation error after merge

This commit is contained in:
Matt
2020-01-04 22:11:35 -08:00
parent 1e94ee4af3
commit 7806afc628
2 changed files with 4 additions and 3 deletions

1
.gitignore vendored
View File

@@ -120,3 +120,4 @@ New client/chameleon-client/*
*.prefs
*.jfr
.DS_Store
*.iml