diff options
| author | cflip <cflip@cflip.net> | 2022-01-25 17:31:28 -0700 |
|---|---|---|
| committer | cflip <cflip@cflip.net> | 2022-01-25 17:31:28 -0700 |
| commit | 03db4d74e12e68943ecb28596b388c1acc8bd883 (patch) | |
| tree | e8a00b3127cc461503149419723213d32f32e0ef /.gitignore | |
| parent | 200988215a3f5674488da928d3d5606ed7e5e2ec (diff) | |
| parent | f02693eed80de7ebf1d03f3d7a8069dd8a3b53ae (diff) | |
Resolve merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -6,4 +6,5 @@ Release/ *.sln *.vcxproj *.vcxproj.filters -*.vcxproj.user
\ No newline at end of file +*.vcxproj.user +/stb_image.h |