This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new abad801 Fixed: plugins in common-theme/webapp/common/js is not
monitored by git (OFBIZ-11745)
abad801 is described below
commit abad801b0c5928c8427ec8baef0ecbe72b081245
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jun 9 13:01:12 2020 +0200
Fixed: plugins in common-theme/webapp/common/js is not monitored by git
(OFBIZ-11745)
In .gitignore in root ofbiz directory there is plugins/
so all directory plugins are ignored
if the line is replace by /plugins/ only root directory plugins is ignored
Thanks: Olivier
Conflict handled by hand
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 6c8252f..7011c30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ bin/
build/
applications/*/build
framework/*/build
-plugins/
+/plugins/
runtime/git-rebase/*
runtime/SvnInfo.ftl
runtime/GitInfo.ftl
