From f404b7716f2e176c6a1819d63fd2a9191fc8a618 Mon Sep 17 00:00:00 2001
From: Danny Adams <da469@cornell.edu>
Date: Tue, 7 Mar 2023 13:56:54 -0500
Subject: [PATCH] Merge clean-up

---
 src/cli/backup/sharepoint.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/cli/backup/sharepoint.go b/src/cli/backup/sharepoint.go
index 22b57846e..3c1cc25ab 100644
--- a/src/cli/backup/sharepoint.go
+++ b/src/cli/backup/sharepoint.go
@@ -69,11 +69,7 @@ corso backup delete sharepoint --backup 1234abcd-12ab-cd34-56de-1234abcd`
 	sharePointServiceCommandDetailsExamples = `# Explore <site>'s files from backup 1234abcd-12ab-cd34-56de-1234abcd
 
 corso backup details sharepoint --backup 1234abcd-12ab-cd34-56de-1234abcd --site <site_id>
-<<<<<<< HEAD
-# Explore site's files created before end of 2015 from a specific backup
-=======
 # Find all site files that were created before a certain date.
->>>>>>> main
 corso backup details sharepoint --backup 1234abcd-12ab-cd34-56de-1234abcd \
       --web-url https://example.com --file-created-before 2015-01-01T00:00:00
 `