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