From 3a7195c21ccba763225e38dbc51531d18416947c Mon Sep 17 00:00:00 2001
From: Adam Ivie <vegaslon@gmail.com>
Date: Wed, 16 Dec 2020 18:37:19 -0500
Subject: [PATCH] Remove artifact from resolving conflict

Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
---
 CONTRIBUTING.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b4d6383f7b..72f296e92e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,6 @@ Contributing
 6. Update your branch
   
   ```
-
   git remote add upstream https://github.com/vircadia/vircadia
   git pull upstream master
   ```