Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
gkLeo committed Apr 30, 2024
2 parents c0ee44a + 0df1c47 commit 3d62b7a
Show file tree
Hide file tree
Showing 1,211 changed files with 49,850 additions and 1,872 deletions.
33 changes: 0 additions & 33 deletions src/Feature/People/items/templates/People/Application Step.yml

This file was deleted.

This file was deleted.

This file was deleted.

33 changes: 0 additions & 33 deletions src/Feature/People/items/templates/People/Award Years Folder.yml

This file was deleted.

33 changes: 0 additions & 33 deletions src/Feature/People/items/templates/People/Award.yml

This file was deleted.

This file was deleted.

33 changes: 0 additions & 33 deletions src/Feature/People/items/templates/People/Country.yml

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,45 +1,42 @@
---
ID: "e20fda97-3f0c-49a0-9257-d55d006a2efe"
Parent: "67cae6b9-7aec-474b-b1ad-7a59355ac9d6"
ID: "f496f42f-25b9-4493-a287-d2eb04022623"
Parent: "8eb3319d-3625-464c-806c-cda62d86343b"
Template: "455a3e98-a627-4b40-8035-e683a0331ac7"
Path: /sitecore/templates/Feature/People/MVP Category/Details/Active
Path: /sitecore/templates/Feature/People/Directory/Directory/Links/DirectoryLink
SharedFields:
- ID: "ab162cc0-dc80-4abf-8871-998ee5d7ba32"
Hint: Type
Value: Checkbox
Value: General Link
- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e"
Hint: __Sortorder
Value: 200
Languages:
- Language: en
Fields:
- ID: "9541e67d-ce8c-4225-803d-33f7f29f09ef"
Hint: __Short description
Value: "[Current MVP Application]"
- ID: "b5e02ad9-d56f-4c41-a065-a133db87bdeb"
Hint: __Display name
Value:
- ID: "19a69332-a23e-4e70-8d16-b2640cb24cc8"
Hint: Title
Value: Directory
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20211022T164139Z
Value: 20240327T135520Z
- ID: "52807595-0f8f-4b20-8d2a-cb71d28c6103"
Hint: __Owner
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "8cdc337e-a112-42fb-bbb4-4143751e123f"
Hint: __Revision
Value: "e92e1cb7-6db2-4ef3-87d1-245bcdb99819"
Value: "064c72dd-e7f0-4e4a-adf4-619c5a7b1c1d"
- ID: "badd9cf9-53e0-4d0c-bcc0-2d784c282f6a"
Hint: __Updated by
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "d9cf14b1-fa16-4ba6-9288-e8a174d4d522"
Hint: __Updated
Value: 20211022T164505Z
Value: 20240327T161253Z
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
---
ID: "f629beeb-a57b-4f69-b7e4-df3fbc2bcf3e"
Parent: "ad9c7837-8660-4360-ba2b-7addf4163685"
ID: "38bd7c12-dd0d-45e7-bfd3-258f4b3c91ad"
Parent: "c8b1348a-21e6-40ac-b7a4-e4f826d9fec5"
Template: "e269fbb5-3750-427a-9149-7aa950b49301"
Path: /sitecore/templates/Feature/People/Person/Data
Path: /sitecore/templates/Feature/People/Directory/Directory/Texts
SharedFields:
- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e"
Hint: __Sortorder
Value: 300
Value: 400
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20211022T144352Z
Value: 20240327T133110Z
- ID: "52807595-0f8f-4b20-8d2a-cb71d28c6103"
Hint: __Owner
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "8cdc337e-a112-42fb-bbb4-4143751e123f"
Hint: __Revision
Value: "5ec233bd-6a99-498d-abdf-e1acd43e5936"
Value: "9bf427fb-cdb8-4184-82b5-5803c8f67e06"
- ID: "badd9cf9-53e0-4d0c-bcc0-2d784c282f6a"
Hint: __Updated by
Value: |
sitecore\Admin
sitecore\ed7gR4aY22
- ID: "d9cf14b1-fa16-4ba6-9288-e8a174d4d522"
Hint: __Updated
Value: 20211025T171442Z
Value: 20240327T135520Z
Loading

0 comments on commit 3d62b7a

Please sign in to comment.