From 503f5c9eebab3a31ea6dcbdec077de4389c218ef Mon Sep 17 00:00:00 2001
From: mgmarlow <graham@mgmarlow.com>
Date: Mon, 12 Jun 2023 20:00:32 -0700
Subject: Fix documentation

---
 clippy-flymake.el | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/clippy-flymake.el b/clippy-flymake.el
index e268c63..ae48c09 100644
--- a/clippy-flymake.el
+++ b/clippy-flymake.el
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 ;;; flymake-clippy.el --- Flymake backend for Clippy  -*- lexical-binding: t; -*-
-=======
-;;; flymake-clippy.el --- Flymake backend for cargo clippy  -*- lexical-binding: t; -*-
->>>>>>> @{-1}
 
 ;; Copyright (C) 2023  Graham Marlow
 
-- 
cgit v1.2.3