Differences between revisions 221 and 222
| 
  
   Size: 993 
  
  Comment: corrected ArduinoTag 2016 entry 
 | 
  
   Size: 684 
  
  Comment: conflict removed 
 | 
| Deletions are marked like this. | Additions are marked like this. | 
| Line 10: | Line 10: | 
---- /!\ '''Edit conflict - other version:''' ---- * 2016-04-02 ab 11:00 -- [[ArduinoTag/2016]] [[TitleKalendar/Anleitung|Anleitung]] um Termine im Space abzuhalten. Das [[TitleKalendar/Archiv|Archiv]]. ---- /!\ '''Edit conflict - your version:''' ----  | 
|
| Line 20: | Line 13: | 
---- /!\ '''End of edit conflict''' ----  | 
- 2016-02-04 19:00-23:59 -- Hacknacht
 2016-02-09 18:30-22:00 -- Linzer Arduino User Group (Linzer AUG)
- 2016-02-11 19:00-23:59 -- Hacknacht
 2016-02-12 17:00-19:00 -- Freizeichen (FSFE Gruppe Linz)
- 2016-02-18 19:00-23:59 -- Hacknacht
 - 2016-02-25 19:00-23:59 -- Hacknacht
 2016-03-02 19:00-22:00 -- Linux User Group Linz Treffen
- 2016-04-02 11:00-openend -- Arduinotag 2016
 
