From 2daf6346604062e600334f1553b88ffbe3b9b530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 4 Mar 2021 13:04:50 +0200
Subject: [PATCH] build: fix PPA failure due to updated debsrc
# Conflicts:
# build/ci.go
---
diff.txt | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/diff.txt b/diff.txt
index 250ee70685..1d47d87857 100644
--- a/diff.txt
+++ b/diff.txt
@@ -67,17 +67,3 @@ Date: Thu Mar 4 13:04:50 2021 +0200
build: fix PPA failure due to updated debsrc
-commit 9230ca4924ef3a75f1653d828a2cd845d54977e6
-Author: Péter Szilágyi <peterke@gmail.com>
-Date: Thu Mar 4 10:44:37 2021 +0200
-
- Revert "core/forkid, params: unset Berlin fork number (#22413)"
-
- This reverts commit ba999105ef89473cfe39e5e53354f7099e67a290.
-
-commit 63385374ec0e0a513ff30b9360471769e937244a
-Author: Felix Lange <fjl@twurst.com>
-Date: Wed Mar 3 18:01:31 2021 +0100
-
- params: begin v1.10.1 release cycle
-
--
GitLab