From e5566bd545c8557083a84f651b02a6090316dfed Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 4 Apr 2004 04:44:10 +0000 Subject: Resolve CVS conflicts --- lisp/url/url-irc.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lisp/url/url-irc.el') diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index c4005d19ec7..9ff4e122d52 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -1,7 +1,7 @@ ;;; url-irc.el --- IRC URL interface -;; Author: $Author: wmperry $ -;; Created: $Date: 1999/12/24 12:13:33 $ -;; Version: $Revision: 1.2 $ +;; Author: $Author: monnier $ +;; Created: $Date: 2004/04/04 01:21:46 $ +;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -76,3 +76,5 @@ PASSWORD - What password to use" nil)) (provide 'url-irc) + +;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e -- cgit v1.2.3