diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a6691bc..b01c693 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ +<<<<<<< HEAD ./uploads/* +======= +uploads/ +>>>>>>> refs/remotes/origin/master |
