From 2336ba5f6b2e0cd43ba6d52fd70a72d3e83abdcb Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Tue, 1 Jun 2021 05:28:28 +0200
Subject: [PATCH] gitignore

Change-Id: Iedd6aeb17b1c774a5d96b28e69827796ff769bc1
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5c8caa526..b247c04bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ selftest/Selftest
 .*.sw?
 *.netcat.stderr
 *.d
+*.merged