Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloud.com.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Moura <itsme@paulomoura.com>2017-05-18 18:21:22 +0300
committerPaulo Moura <itsme@paulomoura.com>2017-05-18 18:21:22 +0300
commit8605c68bc71aa26f224fdf1f577415da3d3fef65 (patch)
tree9dfa4c7ba474e799af6116c15ac27226f0dd230d /.gitignore
parent7681ef6db96759cd8f71d2c24570f23e1497712e (diff)
update gitignore and editorconfig
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a8966da5..690455c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,9 @@ node_modules/
l10n/
*.css.map
.idea/
+<<<<<<< Updated upstream
.DS_Store
*.kate-swp
+=======
+*.DS_Store
+>>>>>>> Stashed changes