summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormgmarlow <graham@mgmarlow.com>2023-06-12 20:00:32 -0700
committermgmarlow <graham@mgmarlow.com>2023-06-12 20:00:32 -0700
commit503f5c9eebab3a31ea6dcbdec077de4389c218ef (patch)
tree20d6d68762bdb234de4980aab119789bcccd1b79
parent217ff0ca6e4d4f9e1290d830456a82312cd2b008 (diff)
downloadflymake-clippy-503f5c9eebab3a31ea6dcbdec077de4389c218ef.tar.gz
Fix documentation
-rw-r--r--clippy-flymake.el4
1 files changed, 0 insertions, 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