From 23bbf5745f4ac7855e7b753428a192095833a2c3 Mon Sep 17 00:00:00 2001 From: Aekez Date: Tue, 13 Mar 2018 22:44:11 +0100 Subject: [PATCH] update --- github-resources/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/github-resources/README.md b/github-resources/README.md index 20df76f..26bb7d5 100644 --- a/github-resources/README.md +++ b/github-resources/README.md @@ -1,6 +1,2 @@ ### Github resources ### -<<<<<<< HEAD Anything found here is not meant for consumption *waves hand* move along, move along... -======= -These are not meant for consumption, but is used as resources here on Qubes Community. ->>>>>>> 0dafff1ddb02cd06e4da688bc1f1aa363602016e