Skip to content

Commit 1de74c7

Browse files
author
Andreas Schaefer
committed
Merge branch 'develop'
# Conflicts: # .idea/libraries/commons_io_commons_io_2_4.xml # .idea/libraries/org_apache_jackrabbit_vault_org_apache_jackrabbit_vault_3_0_0.xml # .idea/libraries/org_apache_jackrabbit_vault_org_apache_jackrabbit_vault_rcp_3_0_0.xml
2 parents 059b3b6 + cb4a2b5 commit 1de74c7

File tree

109 files changed

+140
-1665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+140
-1665
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# IntelliJ Project Ignores
2+
.idea/workspace.xml
3+
.idea/tasks.xml
4+
out
5+
AEM IDE Tooling 4 IntelliJ.zip

‎.idea/libraries/Apache_Sling_IDE_trunk.xml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Maven__org_apache_jackrabbit_jackrabbit_core_2_4_0.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.idea/libraries/Maven__org_osgi_org_osgi_core_4_3_1.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.idea/libraries/aemdc_with_dependencies.xml‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/commons_io_commons_io_2_4.xml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.idea/libraries/javax_jcr_2_0.xml‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/org_apache_jackrabbit_vault_org_apache_jackrabbit_vault_3_0_0.xml‎

Lines changed: 0 additions & 580 deletions
This file was deleted.

‎.idea/libraries/org_apache_jackrabbit_vault_org_apache_jackrabbit_vault_3_1_38.xml‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)