more dates updated

Author: gocko

2023-Conference/awardsCall2022.pillar

@@ -5,7 +5,11 @@
 Have you written cool Smalltalk project you want to share? 
 Developers of any Smalltalk-based software can participate by submitting a 3-5min video about their software. 
 
+<<<<<<< HEAD
 ""Submission Deadline: Sunday August 20"" 
+=======
+""Submission Deadline: Sunday August 13"" 
+>>>>>>> refs/remotes/origin/source
 
 Participants demonstrate their systems in a session at the end of Monday, after which the conference attendees vote. A vote consists in providing a sorted list of 3 preferred pieces of software.
 

2023-Conference/awardsSubmissions.pillar

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
 "title": "Projects Submitted to the Innovation Technology Awards 2023"
+=======
+"title": "Projects Submitted to the Innovation Technology Awards 2022"
+>>>>>>> refs/remotes/origin/source
 }
 !Projects Submitted to the *Innovation Technology Awards 19th Edition>https://esug.github.io/2023-Conference/awardsCall2023.html*
 

2023-Conference/call2022.pillar

@@ -2,7 +2,11 @@
 
 Call-for-Presentations 29th International Smalltalk Joint Conference
 The ESUG board is pleased to announce that the 29th ESUG conference/summer-school 
+<<<<<<< HEAD
 will be held in Lyon, France 28 August - 1 September 2023; with Camp Smalltalk 26-27 August 2023. 
+=======
+will be held in Lyon, France xx-yy August 2023; with Camp Smalltalk xx-2-xx-1 August 2023. 
+>>>>>>> refs/remotes/origin/source
 The conference is organized by the ...
 
 %Registration is available at: *https://registration.esug.org*

2023-Conference/camp2022.pillar

@@ -4,8 +4,13 @@ The idea is to meet, hack, discuss.
 
 - location:	to be announced
 - dates & times:	
+<<<<<<< HEAD
 -- Saturday, 26.8.2023 from 11:00 AM to 6:00 PM
 -- Sunday, 27.8.2023 from 11:00 AM to 6:00 PM
+=======
+-- Saturday, xx-2.8.2020 from 11:00 AM to 6:00 PM
+-- Sunday, xx-1.8.2020 from 11:00 AM to 6:00 PM
+>>>>>>> refs/remotes/origin/source
 
 
 To have and idea who is coming, please fill out this doodle (will be announced).

2023-Conference/conf2022.pillar

@@ -24,10 +24,17 @@ The conference registration will be open soon on our portal.
 
 %Early registration deadline: XXX (to be announced)
 
+<<<<<<< HEAD
 Orientational conference prices from ESUG 2022 in Euros:
 
 - Early Registration Fee: 500€ (all days) / 150€ (per day)
 - Late Registration Fee: 700€ (all days) / 250€ (per day)
+=======
+Orientational conference prices from ESUG 2019 in Euros:
+
+- Early Registration Fee: 500€ (all days) / 180€ (per day)
+- Late Registration Fee: 660€ (all days) / 210€ (per day)
+>>>>>>> refs/remotes/origin/source
 - Extra person to social dinner: 60€
 - Payment by bank transfer: free of charge
 - Payment by credit card: \+6\% fees