From f40af4fa03cfd0db441f3ceb5d5ff422e7e426fe 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:57:02 +0200
Subject: [PATCH] build: add support for Ubuntu Hirsute Hippo

# Conflicts:
#	build/ci.go
---
 diff.txt | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/diff.txt b/diff.txt
index 1d47d87857..4c7d0e499e 100644
--- a/diff.txt
+++ b/diff.txt
@@ -52,18 +52,4 @@ Date:   Thu Mar 4 13:57:02 2021 +0200
 
     build: add support for Ubuntu Hirsute Hippo
 
-commit 89026d5d70835a6587577fcd96f1d49c5aa4e909
-Merge: 63385374e de61da99c
-Author: Péter Szilágyi <peterke@gmail.com>
-Date:   Thu Mar 4 13:12:03 2021 +0200
-
-    Merge pull request #22431 from karalabe/builder-fix-ppa
-    
-    build: fix PPA failure due to updated debsrc
-
-commit de61da99c49146200b0f0db07dd2be6afe1232ec
-Author: Péter Szilágyi <peterke@gmail.com>
-Date:   Thu Mar 4 13:04:50 2021 +0200
-
-    build: fix PPA failure due to updated debsrc
 
-- 
GitLab