From 518f03c4fb5aa4757ef49730162d8b9013fb54b8 Mon Sep 17 00:00:00 2001
From: Chris Roberts <chris@naxxfish.net>
Date: Sun, 3 Nov 2019 15:06:28 +0000
Subject: [PATCH] resolve merge conflict

---
 USERS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/USERS.md b/USERS.md
index 8fe57c4..3f0173b 100644
--- a/USERS.md
+++ b/USERS.md
@@ -15,10 +15,13 @@
 - https://zaine.me **Amine Zaine** (Cloud Engineer)
 - https://notes.dmaitre.phyip3.dur.ac.uk/computing-club/ **Ryan Moodie** (Physics PhD student)
 - https://thecodecousins.com **Stanley Nguyen** (Software Engineer) & **Hoang Do** (Software & IoT Engineer)
+<<<<<<< HEAD
 - https://naxxfish.net **Chris Roberts** (Broadcast Systems Engineer)
 - https://schacherbauer.dev **Markus Schacherbauer** (Student Developer)
 - https://rinma.dev **Marvin Dalheimer** (Software Developer)
 - https://lunar.computer **Lunar Computer** (DevOps Engineer)
+=======
+>>>>>>> parent of 2438bb4... added Chris Roberts to users
 
 <!--
 TEMPLATE: