From ca8c4a43627fe177ff4b87f842dc8ed21793e05c Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 13 Nov 2018 17:44:06 +0100 Subject: [PATCH] version 8.4.0 --- .gitignore | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index dea6cb7e..a72a9d4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -<<<<<<< HEAD +<<<<<<< HEAD # Fichiers temporaires site/tmp/* @@ -11,19 +11,18 @@ site/data/* # Fichiers uploadés site/file/source/* site/file/thumb/* -======= + + # Fichiers de données site/* ->>>>>>> 8.3.14 # Dossiers vides dans GitHub !.gitkeep # PHPStorm .idea/ -<<<<<<< HEAD -======= + #Visual Code .vscode ->>>>>>> 8.3.14 +