diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-08 15:28:35 +0100 |
| commit | b6469566c2c88e8a61334d5d15a0f7c1afe08288 (patch) | |
| tree | f42dd4962c74057c6432866205b16c9d78a1c07e /.gitignore | |
| parent | remove dev logs (diff) | |
| parent | correctly update services submenu on language change (diff) | |
| download | ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.gz ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.tar.zst ferdium-app-b6469566c2c88e8a61334d5d15a0f7c1afe08288.zip | |
fix merge conflicts with latest develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 245057c46..d38c475bf 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -3,6 +3,7 @@ node_modules | |||
| 3 | flow-typed | 3 | flow-typed |
| 4 | out | 4 | out |
| 5 | .DS_Store | 5 | .DS_Store |
| 6 | .idea | ||
| 6 | build | 7 | build |
| 7 | .tmp | 8 | .tmp |
| 8 | .stage | 9 | .stage |