Remove merge garbage

rswgnu · Feb 6, 2023 · 34f448c · 34f448c
1 parent ec3b654
commit 34f448c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/hibtypes.el b/hibtypes.el
@@ -3,11 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-<<<<<<< HEAD
-;; Last-Mod:      6-Feb-23 at 22:45:10 by Mats Lidell
-=======
-;; Last-Mod:      5-Feb-23 at 23:02:42 by Mats Lidell
->>>>>>> c642cf6cd9 (Review comments, rebase on to master)
+;; Last-Mod:      6-Feb-23 at 22:48:48 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;