diff --git a/.gitignore b/.gitignore index 4ed6982..929cd32 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ ## Except !**/.gitignore -!**/.git/hooks/post-merge !/etc/*.ini !/etc/atb/*.ini !/etc/psa_config/* @@ -14,5 +13,5 @@ !/opt/app/sysconfig/*.ini !/opt/app/ISMASMgr/*.ini -!/tmp/test.txt +!**/.githooks/post-merge