This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via f851bc34d0983c74155522ad639b8a250f452938 (commit)
from 97ffe89726b1a95bfa03d60a4805fb54d821da14 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f851bc34d0983c74155522ad639b8a250f452938
commit f851bc34d0983c74155522ad639b8a250f452938
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu May 4 14:26:10 2017 +0200
Remove <<<<<<< 5c02d437ae2ab9d01370cc9aec4ecc46f3602746
diff --git a/src/common/tracker/ArtifactExtraField.class.php
b/src/common/tracker/ArtifactExtraField.class.php
index 36af66c..0176971 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -1205,7 +1205,6 @@ class ArtifactExtraField extends FFError {
}
/**
-<<<<<<< 5c02d437ae2ab9d01370cc9aec4ecc46f3602746
* getMandatoryExtraFields - List of possible user built extra fields
* set up for this artifact type.
*
@@ -1274,7 +1273,7 @@ class ArtifactExtraField extends FFError {
return $return;
}
-
+
/**
* getAvailableAggregationRules - the types of text fields and their
names available.
*
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactExtraField.class.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
