From 9776dd1dcf386ca0110bdaca071c5336319dccf4 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Mon, 16 Dec 2024 05:56:44 -0500
Subject: [PATCH 1/4] Add droidcon London for android

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

diff --git a/conferences/2025/android.json b/conferences/2025/android.json
index 1c0241619..b54a353f9 100644
--- a/conferences/2025/android.json
+++ b/conferences/2025/android.json
@@ -13,5 +13,17 @@
     "cfpEndDate": "2025-02-15",
     "twitter": "@AndroidMakersFR",
     "mastodon": "@droidcon@androiddev.social"
+  },
+  {
+    "name": "droidcon London",
+    "url": "https://london.droidcon.com",
+    "startDate": "2025-10-30",
+    "endDate": "2025-10-31",
+    "city": "London",
+    "country": "U.K.",
+    "online": false,
+    "locales": "EN",
+    "cocUrl": "https://london.droidcon.com/code-of-conduct/",
+    "twitter": "@droidconLondon"
   }
 ]
\ No newline at end of file

From d4efb9fddb6646f769e9710bb5ead8ab68b4d6b0 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Mon, 16 Dec 2024 05:56:45 -0500
Subject: [PATCH 2/4] Add droidcon London for networking

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

diff --git a/conferences/2025/networking.json b/conferences/2025/networking.json
index a9f915fda..e015928e0 100644
--- a/conferences/2025/networking.json
+++ b/conferences/2025/networking.json
@@ -147,5 +147,17 @@
     "cfpUrl": "https://sessionize.com/infobip-shift-2025",
     "cfpEndDate": "2025-06-01",
     "twitter": "@InfobipShift"
+  },
+  {
+    "name": "droidcon London",
+    "url": "https://london.droidcon.com",
+    "startDate": "2025-10-30",
+    "endDate": "2025-10-31",
+    "city": "London",
+    "country": "U.K.",
+    "online": false,
+    "locales": "EN",
+    "cocUrl": "https://london.droidcon.com/code-of-conduct/",
+    "twitter": "@droidconLondon"
   }
 ]
\ No newline at end of file

From a873e9451b3937232aa82c8b2e143469e12bcbcc Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Mon, 16 Dec 2024 05:56:46 -0500
Subject: [PATCH 3/4] Add droidcon London 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 9cdcc1897..a42c80927 100644
--- a/conferences/2025/general.json
+++ b/conferences/2025/general.json
@@ -463,5 +463,17 @@
     "country": "Germany",
     "online": false,
     "locales": "EN"
+  },
+  {
+    "name": "droidcon London",
+    "url": "https://london.droidcon.com",
+    "startDate": "2025-10-30",
+    "endDate": "2025-10-31",
+    "city": "London",
+    "country": "U.K.",
+    "online": false,
+    "locales": "EN",
+    "cocUrl": "https://london.droidcon.com/code-of-conduct/",
+    "twitter": "@droidconLondon"
   }
 ]
\ No newline at end of file

From e04d09ad5c5f9674bee43e7598c5881b8386dfc8 Mon Sep 17 00:00:00 2001
From: Christian Grail <cgrail@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:43:25 +0100
Subject: [PATCH 4/4] droidcon general

---
 conferences/2025/android.json    | 12 ------------
 conferences/2025/networking.json | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/conferences/2025/android.json b/conferences/2025/android.json
index b54a353f9..1c0241619 100644
--- a/conferences/2025/android.json
+++ b/conferences/2025/android.json
@@ -13,17 +13,5 @@
     "cfpEndDate": "2025-02-15",
     "twitter": "@AndroidMakersFR",
     "mastodon": "@droidcon@androiddev.social"
-  },
-  {
-    "name": "droidcon London",
-    "url": "https://london.droidcon.com",
-    "startDate": "2025-10-30",
-    "endDate": "2025-10-31",
-    "city": "London",
-    "country": "U.K.",
-    "online": false,
-    "locales": "EN",
-    "cocUrl": "https://london.droidcon.com/code-of-conduct/",
-    "twitter": "@droidconLondon"
   }
 ]
\ No newline at end of file
diff --git a/conferences/2025/networking.json b/conferences/2025/networking.json
index e015928e0..a9f915fda 100644
--- a/conferences/2025/networking.json
+++ b/conferences/2025/networking.json
@@ -147,17 +147,5 @@
     "cfpUrl": "https://sessionize.com/infobip-shift-2025",
     "cfpEndDate": "2025-06-01",
     "twitter": "@InfobipShift"
-  },
-  {
-    "name": "droidcon London",
-    "url": "https://london.droidcon.com",
-    "startDate": "2025-10-30",
-    "endDate": "2025-10-31",
-    "city": "London",
-    "country": "U.K.",
-    "online": false,
-    "locales": "EN",
-    "cocUrl": "https://london.droidcon.com/code-of-conduct/",
-    "twitter": "@droidconLondon"
   }
 ]
\ No newline at end of file