You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2021/04/29 08:29:22 UTC
[syncope] branch master updated: removing merge message line
This is an automated email from the ASF dual-hosted git repository.
andreapatricelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 624e5b7 removing merge message line
624e5b7 is described below
commit 624e5b7327702d1141fe9f6f8c24e647f38ed320
Author: Andrea Patricelli <an...@apache.org>
AuthorDate: Thu Apr 29 10:24:41 2021 +0200
removing merge message line
---
core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml
index 41219a5..47abe2c 100644
--- a/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/main/resources/domains/MasterContent.xml
@@ -80,7 +80,6 @@ under the License.
<SyncopeConf id="cd64d66f-6fff-4008-b966-a06b1cc1436d"
plainAttrs="[{"values":[{"stringValue":"SSHA256"}],"schema":"password.cipher.algorithm"},{"values":[{"stringValue":""}],"schema":"notificationjob.cronExpression"},{"values":[{"longValue":3}],"schema":"notification.maxRetries"},{"values":[{"longValue":256}],"schema":"token.length"},{"values&q [...]
- >>>>>>> b33cc1415... [SYNCOPE-1517] Initial changes
<AnyType id="USER" kind="USER"/>
<AnyTypeClass id="BaseUser"/>
<AnyType_AnyTypeClass anyType_id="USER" anyTypeClass_id="BaseUser"/>