You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/en/stories/_index.md
+4Lines changed: 4 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -28,7 +28,11 @@ aliases:
28
28
{{< /company >}}
29
29
{{< company name="Alliander" image="/images/logos/alliander.png" video="https://youtu.be/Q6yCZI4f2bo?t=1131" >}}
30
30
{{< /company >}}
31
+
<<<<<<< Updated upstream
31
32
{{< 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
32
36
{{< /company >}}
33
37
{{< company name="American Airlines" image="/images/logos/americanairlines.png" article="https://tech.aa.com/2020-10-30-innersource/" >}}
0 commit comments