[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - .gitignore ios/.gitignore

[Libreoffice Gerrit user]

 .gitignore     |    1 +
 ios/.gitignore |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c416d3219f50720f82cbfbff5e6a65d0b49d62f9
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 29 11:00:45 2018 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Jan 9 11:47:43 2019 +0100

    Also ios/config.h is generated at configure time
    
    Change-Id: I285cadfe037f054a331d4513bf999f10c1ef1ed9
    (cherry picked from commit d46854680c4833b12ee5d36c952720a2204b855b)
    Reviewed-on: https://gerrit.libreoffice.org/66010
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/.gitignore b/.gitignore
index f910a6d82..3ae601398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ aclocal.m4
 autom4te.cache
 config.h
 config.h.in
+ios/config.h
 config.log
 config.guess
 config.status
diff --git a/ios/.gitignore b/ios/.gitignore
deleted file mode 100644
index 120fe7749..000000000
--- a/ios/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!config.h