diff options
author | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
---|---|---|
committer | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
commit | cbb7480ca76cbe11c40f05a269583201dd044796 (patch) | |
tree | 8ce39d5a975d66a5c6a38e47460c2330f15a087e /.gitignore | |
parent | 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 (diff) | |
parent | 12204b210e5279b0bfba5601d34195739cab6ab8 (diff) |
Fix merge conflicts after auto merge
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 839d14bc0d..7d2f4789ab 100755 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ indra/newview/dbghelp.dll indra/newview/filters.xml indra/newview/fmod.dll indra/newview/fmod.log +indra/newview/fonts indra/newview/mozilla-theme indra/newview/mozilla-universal-darwin.tgz indra/newview/pilot.txt |