diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:46:51 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:46:51 +0200 |
| commit | 5f4a132f1656d8aa388e1ca3151c1bcc222c0cb6 (patch) | |
| tree | b7e722dbdfdc8bb0e8caa74563086163fd133401 /.gitignore | |
| parent | 508097bd45862195ab45e2179806af78084b83b1 (diff) | |
| parent | 766683ed07acf3339b750b24f85136c6aab8c717 (diff) | |
foo
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 |
