fix merge

1 files changed, 17 insertions, 2 deletions

diff --git a/data/oss_projects.yml b/data/oss_projects.yml
index 284bd71..633d77c 100644
--- a/data/oss_projects.yml
+++ b/data/oss_projects.yml
@@ -2394,7 +2394,7 @@
     project_description: "NusaOpenGov is a social experiment to test pure democratic governance, and rebuilding democracy using blockchain"
     project_url: 'https://nusaopengov.tech'
     gitlab_plan: Gold
-    
+
 -
     project_name: 'OAM'
     project_description: "Application allowing first aid associations to centralize the documents necessary for first aid associations."
@@ -2405,7 +2405,22 @@
     project_description: 'OpenGeoSys (OGS) is a scientific open source project for the development of numerical methods for the simulation of thermo-hydro-mechanical-chemical (THMC) processes in porous and fractured media.'
     project_url: 'https://www.opengeosys.org/'
     gitlab_plan: Ultimate
-
+-
+    project_name: 'Vapas'
+    project_description: 'An open-source, modern iOS APT repository designed to take full advantage of newer APT clients.'
+    project_url: 'https://gitlab.com/vapas'
+    gitlab_plan: Gold
+-
+    project_name: 'Xonotic'
+    project_description: "Xonotic is an addictive, arena-style first person shooter with crisp movement and a wide array of weapons."
+    project_url: 'https://www.xonotic.org'
+    gitlab_plan: Ultimate
+-
+    project_name: 'Traffic3D'
+    project_description: 'Traffic3D: A Rich 3D Traffic Environment to Train Intelligent Agents.'
+    project_url: 'https://traffic3d.org/'
+    gitlab_plan: Gold
+-
     project_name: 'TurboWin'
     project_description: "TurboWin is an open source project for providing meteorological observations made on board voluntary observing ships to meteorological centers as part of WMO's Global Observing System (GOS)"
     project_url: 'http://projects.knmi.nl/turbowin/'