Commit 774a1a1a authored by Andreas Schwab's avatar Andreas Schwab

Remove conflict marker.

parent 04a5d30f
......@@ -34,7 +34,6 @@
* viper.el (viper-non-hook-settings): Fixed the names of defadvices.
>>>>>>> 1.7661
2005-06-01 Luc Teirlinck <>
* autorevert.el (auto-revert-buffers): Use save-match-data.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment