From e41f1a1317f3b3f68fa79e4b2949c10d265c5cd5 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Thu, 7 Oct 2021 23:40:32 +0000
Subject: [PATCH] chore: fix merge conflict (#34)

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/34
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 15211eb..c445b53 100644
--- a/README.md
+++ b/README.md
@@ -88,3 +88,4 @@ DevOS is licensed under the [MIT License][mit].
 [nixpkgs]: https://github.com/NixOS/nixpkgs
 [nvfetcher]: https://github.com/berberman/nvfetcher
 [please]: https://github.com/nrdxp/devos/tree/nrd
+[matrix]: https://matrix.to/#/#devos:nixos.org