CIF-1385 - Create the Core CIF Components library pages - productcarousel component #271
Commits on May 13, 2020
-
Merge branch 'master' into CIF-1385
# Conflicts: # examples/ui.apps/src/main/content/jcr_root/apps/cif-components-examples/clientlibs/cif-clientlib-base/.content.xml # examples/ui.apps/src/main/content/jcr_root/apps/cif-components-examples/clientlibs/venia-theme/cif-demo.css # examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/.content.xml # examples/ui.content/src/main/content/jcr_root/content/core-components-examples/library/commerce/.content.xml
-
CIF-1385 - Create the Core CIF Components library pages - productcaro…
…usel component - fix git merge issue
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.