diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
| commit | 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af (patch) | |
| tree | 22cd361727f2d14f5fc4ac4925397947ccb77af3 /.gitignore | |
| parent | ba9b3dfae3166406fa759b1c52909c12b47d09fc (diff) | |
removed merge conflicts
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 |
