From 85b41776e7f295736a43eb1f60e50e05573857bf Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@localhost.localdomain>
Date: Sun, 26 Jan 2020 03:36:40 -0800
Subject: [PATCH] Fix conflicts

---
 Tracker/TrackerDigitization/FaserSCT_Digitization/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/README.md b/Tracker/TrackerDigitization/FaserSCT_Digitization/README.md
index 00fe54b93..68b5b0723 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/README.md
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/README.md
@@ -36,3 +36,4 @@ run > FaserSCT_DigitizationDbg.py >& digi.log
 
 This will read your `g4.HITS.root` and generate an RDO data file with digitized raw data objects.
 
+
-- 
GitLab