summaryrefslogtreecommitdiff
path: root/clippy-flymake.el
diff options
context:
space:
mode:
Diffstat (limited to 'clippy-flymake.el')
-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