Skip to content

Commit 83d25c9

Browse files
omeridaomerida
committed
DIGITAL-89: Fixes composer merge conflict
1 parent 82f7f19 commit 83d25c9

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

‎composer.lock

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

‎composer.log

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ c73ec25d5b68a3e0e1bdfc83c24312ba|Matt Poole|feature/DIGITAL-396-update-deps-8-0|
7171
d0ca998c567e8cc218ee57bb5c9b6679|cathybaptista|feature/DIGITAL-119-configure-images|Thu Feb 6 11:06:05 EST 2025|./composer.sh require drupal/media_library_edit
7272
6b5963bf3c6740285c129be6d6273aed|cathybaptista|feature/DIGITAL-119-configure-images|Thu Feb 6 11:06:14 EST 2025|./composer.sh require drupal/edit_media_modal
7373
caeb4cc7f30e1f80c7425f9c3fcf8a98|Oscar Merida|feature/DIGITAL-89-linkit|Wed Feb 5 16:40:40 EST 2025|./composer.sh require drupal/linkit:^7.0
74+
c063010712247ba9dfd709c97fccb648|Oscar Merida|feature/DIGITAL-89-linkit|Thu Feb 6 16:27:25 EST 2025|./composer.sh require drupal/linkit:^7.0

0 commit comments

Comments
 (0)