Aice meetup: update agenda, remove virtual event occurrence

content/2021/aice-meetup-brussels-2021-11-24/_index.md

@@ -2,11 +2,7 @@
 title: "AICE Working Group Meetup in Brussels"
 headline: "AICE Working Group Meetup - Brussels"
 subtitle: ""
-<<<<<<< HEAD
 tagline: "Meetup | November 24, 2021 9:00 - 17:00 (CEST)"
-=======
-tagline: "Hybrid meetup | November 24, 2021 9:00 - 17:00 (CEST)"
->>>>>>> 071f252... Add AICE meetup event 2021-11-24. (#230)
 date: 2021-11-24T09:00:00+02:00
 hide_page_title: true
 hide_sidebar: true
@@ -24,12 +20,7 @@ The AICE OpenLab meetup is the first opportunity we have to join together after
 
 The adoption of AI, Cloud & Edge technologies and solutions highly depends on security, privacy and open specifications. Therefore Eclipse Foundation has initiated the AICE (AI, Cloud & Edge) OpenLab: the open, vendor neutral hands-on collaborative environment to foster interoperability and compatibility in AI, Cloud and Edge with Open Source. The AICE OpenLab aims to provide testbeds and open source governance for industry, research institutes and academia to experiment, evaluate and validate AI technologies on different cloud and edge architectures. During this meetup, we will also unveil the healthcare pilot project of the AICE OpenLab.
 
-<<<<<<< HEAD
 Join us, Wednesday, November 24th in Brussels, for this face to face event!
-=======
-Join us, Wednesday, November 24th in Brussels, for this face to face and virtual event!
->>>>>>> 071f252... Add AICE meetup event 2021-11-24. (#230)
-
 
 
   {{</ events/registration >}}
@@ -48,3 +39,4 @@ Join us, Wednesday, November 24th in Brussels, for this face to face and virtual
 {{</ grid/section-container >}}
 
 {{< bootstrap/modal id="eclipsefdn-modal-event-session" >}}
+

data/en/2021/aice-meetup-brussels/agenda.yml

@@ -3,19 +3,11 @@ types:
     - name: Keynote 
       id: keynote 
       color: "#f79623"
-<<<<<<< HEAD
     - name: Afternoon Session
       id: session_1
       color: "#DDA0DD"
     - name: Breaks
       id: break
-=======
-    - name: Session 1 - AI
-      id: session_1
-      color: "#DDA0DD"
-    - name: Session 2 - Cloud
-      id: session_2
->>>>>>> 071f252... Add AICE meetup event 2021-11-24. (#230)
       color: "#BA55D3"
     - name: Session 3 - Edge
       id: session_3
@@ -23,7 +15,6 @@ types:
 
 items:
     - name: Registration
-<<<<<<< HEAD
       time: 08:30 - 09:15 (CEST)
     - name: Welcome speech and agenda
       presenter: Gaël Blondelle (Eclipse Foundation)
@@ -51,30 +42,11 @@ items:
 
     - name: Lunch
       time: 12:00 - 13:00 (CEST)
-=======
-      time: 09:00 - 09:30 (CEST)
-    - name: Welcome speech and agenda
-      presenter: Gaël Blondelle (Eclipse Foundation)
-      time: 09:30 - 09:45 (CEST)
-    - name: EC OSS Study and AI Policy
-      presenter: Paula Grzegorzewska (OpenForum Europe)
-      type: keynote
-      time: 09:45 - 10:15 (CEST)
-    - name: Gaia-X and AI
-      presenter: Pierre Gronlier (Gaia-X)
-      type: keynote
-      time: 11:15 - 11:00 (CEST) 
-    - name: The AICE OpenLab - Showcase AICE OpenLab Pilot
-      presenter: Gaël Blondelle, Boris Baldassari (Eclipse Foundation)
-      type: keynote
-      time: 11:15 - 12:00 (CEST) 
->>>>>>> 071f252... Add AICE meetup event 2021-11-24. (#230)
 
     - name: AI4EU Experiments
       presenter: Martin Welss (Fraunhofer IAIS)
       type: session_1
       time: 13:00 - 13:30 (CEST)
-<<<<<<< HEAD
     - name: MindSpore
       presenter: Jean-Baptiste Onofre (Huawei)
       type: session_1
@@ -110,32 +82,3 @@ items:
 
     - name: Closing / Drinks
       time: 15:45 - 17:00 (CEST)
-
-=======
-    - name: Open Services Cloud
-      presenter: Bryan Che (Huawei)
-      type: session_2
-      time: 13:00 - 13:30 (CEST)
-    - name: OpenHarmony and AI
-      presenter: Andrea Basso (Synesthesia), Adrian O'Sullivan (Huawei)
-      type: session_3
-      time: 13:00 - 13:30 (CEST)
-
-    - name: MindSpore
-      presenter: TBD
-      type: session_1
-      time: 13:30 - 14:00 (CEST)
-    - name: Open Cloud developments
-      presenter: SDIA / OpenUK / Warren.io
-      type: session_2
-      time: 13:30 - 14:00 (CEST)
-    - name: Open Euler
-      presenter: Mauro Carvalho Chehab, Roberto Sassu
-      type: session_3
-      time: 13:30 - 14:00 (CEST)
-
-    - name: Open Discussion
-      time: 15:00 - 15:45 (CEST)
-    - name: Closing / Drinks
-      time: 15:45 - 17:00 (CEST)
->>>>>>> 071f252... Add AICE meetup event 2021-11-24. (#230)