From 1340b2ca61abf098d3a1c906252217fd47ec9560 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Sun, 14 Jul 2024 22:44:53 -0400
Subject: [PATCH 1/3] Add DevOpsCon Berlin for devops

---
 conferences/2025/devops.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/conferences/2025/devops.json b/conferences/2025/devops.json
index 7f5ac9424..cabad74dd 100644
--- a/conferences/2025/devops.json
+++ b/conferences/2025/devops.json
@@ -68,6 +68,18 @@
     "twitter": "@jcon_conference",
     "mastodon": "@jcon@mastodon.social"
   },
+  {
+    "name": "DevOpsCon Berlin",
+    "url": "https://devopscon.io/berlin",
+    "startDate": "2025-06-16",
+    "endDate": "2025-06-19",
+    "city": "Berlin",
+    "country": "Germany",
+    "online": true,
+    "locales": "EN",
+    "cocUrl": "https://devopscon.io/code-of-conduct",
+    "twitter": "@devops_con"
+  },
   {
     "name": "KubeCon + CloudNativeCon North America",
     "url": "https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america-2025/",

From 49bce91a582eb3846497b5b15f7ef86338475590 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Sun, 14 Jul 2024 22:44:54 -0400
Subject: [PATCH 2/3] Add DevOpsCon Berlin for dotnet

---
 conferences/2025/dotnet.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/conferences/2025/dotnet.json b/conferences/2025/dotnet.json
index 4a6037c94..80d1cadb4 100644
--- a/conferences/2025/dotnet.json
+++ b/conferences/2025/dotnet.json
@@ -21,5 +21,17 @@
     "online": false,
     "cocUrl": "https://futuretech.nl/code-of-conduct/",
     "twitter": "@futuretechnl"
+  },
+  {
+    "name": "DevOpsCon Berlin",
+    "url": "https://devopscon.io/berlin",
+    "startDate": "2025-06-16",
+    "endDate": "2025-06-19",
+    "city": "Berlin",
+    "country": "Germany",
+    "online": true,
+    "locales": "EN",
+    "cocUrl": "https://devopscon.io/code-of-conduct",
+    "twitter": "@devops_con"
   }
 ]
\ No newline at end of file

From d59388c9fcd37e378e1d77e8159bfb2a42685b75 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Sun, 14 Jul 2024 22:44:54 -0400
Subject: [PATCH 3/3] Add DevOpsCon Berlin for general

---
 conferences/2025/general.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/conferences/2025/general.json b/conferences/2025/general.json
index 10532dc55..01430b4b4 100644
--- a/conferences/2025/general.json
+++ b/conferences/2025/general.json
@@ -83,5 +83,17 @@
     "locales": "EN",
     "cocUrl": "https://renderatl.com/code-of-conduct",
     "twitter": "@RenderATL"
+  },
+  {
+    "name": "DevOpsCon Berlin",
+    "url": "https://devopscon.io/berlin",
+    "startDate": "2025-06-16",
+    "endDate": "2025-06-19",
+    "city": "Berlin",
+    "country": "Germany",
+    "online": true,
+    "locales": "EN",
+    "cocUrl": "https://devopscon.io/code-of-conduct",
+    "twitter": "@devops_con"
   }
 ]
\ No newline at end of file