Skip to content

Commit d545901

Browse files
committed
Update _index.md
1 parent ecb8010 commit d545901

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

content/en/stories/_index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ aliases:
2828
{{< /company >}}
2929
{{< company name="Alliander" image="/images/logos/alliander.png" video="https://youtu.be/Q6yCZI4f2bo?t=1131" >}}
3030
{{< /company >}}
31+
<<<<<<< Updated upstream
3132
{{< company name="Amadeus IT Group" image="/images/logos/amadeus.png" video="https://www.youtube.com/watch?v=_lmAiOoQlhA&list=PLCH-i0B0otNQkjMyRiIgnDBVvLHW1_Gab&index=15" >}}
33+
=======
34+
{{< company name="Amadeus IT Group" image="/images/logos/amadeus.jpeg" video="https://www.youtube.com/watch?v=_lmAiOoQlhA&list=PLCH-i0B0otNQkjMyRiIgnDBVvLHW1_Gab&index=15" >}}
35+
>>>>>>> Stashed changes
3236
{{< /company >}}
3337
{{< company name="American Airlines" image="/images/logos/americanairlines.png" article="https://tech.aa.com/2020-10-30-innersource/" >}}
3438
{{< /company >}}

0 commit comments

Comments
 (0)