Resolve CVS conflicts

This commit is contained in:
Miles Bader 2004-04-04 04:44:10 +00:00
parent 1051f1d82c
commit e5566bd545
31 changed files with 137 additions and 79 deletions

View file

@ -1,7 +1,7 @@
;;; url-about.el --- Show internal URLs
;; Author: $Author: wmperry $
;; Created: $Date: 2001/11/24 22:30:21 $
;; Version: $Revision: 1.1 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -98,3 +98,5 @@
(error "URL does not know about `%s'" item))))
(provide 'url-about)
;;; arch-tag: 65dd7fca-db3f-4cb1-8026-7dd37d4a460e

View file

@ -1,7 +1,7 @@
;;; url-auth.el --- Uniform Resource Locator authorization modules
;; Author: $Author: wmperry $
;; Created: $Date: 2001/12/05 19:05:51 $
;; Version: $Revision: 1.4 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -316,3 +316,5 @@ RATING a rating between 1 and 10 of the strength of the authentication.
(assoc scheme url-registered-auth-schemes))
(provide 'url-auth)
;;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91

View file

@ -1,7 +1,7 @@
;;; url-cache.el --- Uniform Resource Locator retrieval tool
;; Author: $Author: fx $
;; Created: $Date: 2002/01/22 17:53:45 $
;; Version: $Revision: 1.4 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -201,3 +201,5 @@ FILE can be created or overwritten."
(t nil))))
(provide 'url-cache)
;;; arch-tag: 95b050a6-8e81-4f23-8e63-191b9d1d657c

View file

@ -1,7 +1,7 @@
;;; url-cid.el --- Content-ID URL loader
;; Author: $Author: fx $
;; Created: $Date: 2001/05/05 16:35:58 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -63,3 +63,5 @@
(url-cid-gnus (url-filename url))))
(t
(message "Unable to handle CID URL: %s" url))))
;;; arch-tag: 23d9ab74-fad4-4dba-b1e7-292871e8bda5

View file

@ -1,7 +1,7 @@
;;; url-cookie.el --- Netscape Cookie support
;; Author: $Author: wmperry $
;; Created: $Date: 2002/10/29 14:44:59 $
;; Version: $Revision: 1.7 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -466,3 +466,4 @@ to run the `url-cookie-setup-save-timer' function manually."
(provide 'url-cookie)
;;; arch-tag: 2568751b-6452-4398-aa2d-303edadb54d7

View file

@ -4,7 +4,7 @@
;; Author: Bill Perry <wmperry@gnu.org>
;; Maintainer: Bill Perry <wmperry@gnu.org>
;; Version: $Revision: 1.6 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: url, vc
;; GNU Emacs is free software; you can redistribute it and/or modify
@ -971,3 +971,5 @@ Returns nil if DIR contains no name starting with FILE.
;;; Miscellaneous stuff.
(provide 'url-dav)
;;; arch-tag: 2b14b7b3-888a-49b8-a490-17276a40e78e

View file

@ -1,7 +1,7 @@
;;; url-dired.el --- URL Dired minor mode
;; Author: $Author: fx $
;; Created: $Date: 2001/05/05 16:44:20 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -100,3 +100,5 @@ Example: (add-minor-mode 'view-minor-mode \" View\" view-mode-map)"
(url-dired-minor-mode t))
(provide 'url-dired)
;;; arch-tag: 2694f21a-43e1-4391-b3cb-cf6e5349f15f

View file

@ -1,7 +1,7 @@
;;; url-expand.el --- expand-file-name for URLs
;; Author: $Author: wmperry $
;; Created: $Date: 1999/12/05 08:09:15 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -141,3 +141,5 @@ path components followed by `..' are removed, along with the `..' itself."
(url-set-filename urlobj (if query (concat file sepchar query) file))))))
(provide 'url-expand)
;;; arch-tag: 7b5f744b-b721-49da-be47-484631680a5a

View file

@ -1,7 +1,7 @@
;;; url-file.el --- File retrieval code
;; Author: $Author: fx $
;; Created: $Date: 2002/04/22 09:14:24 $
;; Version: $Revision: 1.11 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -237,3 +237,5 @@ to them."
(url-file-create-wrapper file-truename (url &optional counter prev-dirs)))
(provide 'url-file)
;;; arch-tag: 010e914a-7313-494b-8a8c-6495a862157d

View file

@ -1,7 +1,7 @@
;;; url-ftp.el --- FTP wrapper
;; Author: $Author: wmperry $
;; Created: $Date: 1999/11/30 12:47:21 $
;; Version: $Revision: 1.1 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -42,3 +42,5 @@
(defalias 'url-ftp 'url-file)
(provide 'url-ftp)
;;; arch-tag: 9c3e70c4-350f-4d4a-bb51-a1e9b459e7dc

View file

@ -1,7 +1,7 @@
;;; url-gw.el --- Gateway munging for URL loading
;; Author: Bill Perry <wmperry@gnu.org>
;; Created: $Date: 2002/04/22 09:26:46 $
;; $Revision: 1.8 $
;; Created: $Date: 2004/04/04 01:21:46 $
;; $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -262,3 +262,5 @@ Will not make a connexion if `url-gateway-unplugged' is non-nil."
conn)))
(provide 'url-gw)
;;; arch-tag: 1c4c0317-6d03-45b8-b3f3-838bd8f9d838

View file

@ -1,7 +1,7 @@
;;; url-handlers.el --- file-name-handler stuff for URL loading
;; Author: $Author: sds $
;; Created: $Date: 2003/06/26 18:45:45 $
;; Version: $Revision: 1.10 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -250,3 +250,5 @@ accessible."
(auto-save-mode 0)))
(provide 'url-handlers)
;;; arch-tag: 7300b99c-cc83-42ff-9147-79b2723c62ac

View file

@ -1,7 +1,7 @@
;;; url-history.el --- Global history tracking for URL package
;; Author: $Author: fx $
;; Created: $Date: 2001/05/05 16:49:52 $
;; Version: $Revision: 1.6 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -197,3 +197,5 @@ user for what type to save as."
(error "url-completion-function very confused."))))
(provide 'url-history)
;;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2

View file

@ -1,6 +1,6 @@
;;; url-http.el --- HTTP retrieval routines
;; Author: Bill Perry <wmperry@gnu.org>
;; Version: $Revision: 1.39 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -1220,4 +1220,5 @@ p3p
(provide 'url-http)
;;; arch-tag: ba7c59ae-c0f4-4a31-9617-d85f221732ee
;;; url-http.el ends here

View file

@ -1,7 +1,7 @@
;;; url-https.el --- HTTP over SSL routines
;; Author: $Author: wmperry $
;; Created: $Date: 2001/11/22 14:32:13 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -51,3 +51,5 @@
(url-https-create-secure-wrapper file-attributes (url))
(provide 'url-https)
;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19

View file

@ -1,7 +1,7 @@
;;; url-imap.el --- IMAP retrieval routines
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Created: $Date: 2002/01/22 17:52:16 $
;; Version: $Revision: 1.4 $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -79,3 +79,5 @@
;; xxx list messages in mailbox (start gnus?)
)))
(current-buffer)))
;;; arch-tag: 034991ff-5425-48ea-b911-c96c90e6f47d

View file

@ -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

View file

@ -1,6 +1,6 @@
;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
;; Author: $Author: wmperry $
;; Created: $Date: 1999/11/26 12:11:50 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
@ -231,3 +231,5 @@
(current-buffer)))
(provide 'url-ldap)
;;; arch-tag: 6230e21c-41ae-4174-bd83-82c835676fc8

View file

@ -1,7 +1,7 @@
;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
;; Author: $Author: fx $
;; Created: $Date: 2001/10/05 17:04:06 $
;; Version: $Revision: 1.4 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -127,3 +127,5 @@
nil))
(provide 'url-mailto)
;;; arch-tag: 7b7ad52e-8760-497b-9444-75fae14e34c5

View file

@ -1,7 +1,7 @@
;;; url-methods.el --- Load URL schemes as needed
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Created: $Date: 2004/04/04 03:10:58 $
;; Version: $Revision: 1.2 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -146,3 +146,5 @@ it has not already been loaded."
(plist-get url-scheme-default-properties property))))
(provide 'url-methods)
;;; arch-tag: 336863f8-5a07-4906-9be5-b3c6bcebbe67

View file

@ -1,7 +1,7 @@
;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
;; Author: $Author: fx $
;; Created: $Date: 2002/04/22 22:23:59 $
;; Version: $Revision: 1.5 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -117,3 +117,5 @@
(current-buffer))))
(provide 'url-misc)
;;; arch-tag: 8c544e1b-d8bc-40a6-b319-f1f37fef65a0

View file

@ -1,7 +1,7 @@
;;; url-news.el --- News Uniform Resource Locator retrieval code
;; Author: $Author: fx $
;; Created: $Date: 2001/05/22 16:13:00 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -133,3 +133,5 @@
(url-news url)))
(provide 'url-news)
;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311

View file

@ -1,7 +1,7 @@
;;; url-nfs.el --- NFS URL interface
;; Author: $Author: fx $
;; Created: $Date: 2001/05/22 16:10:50 $
;; Version: $Revision: 1.3 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -95,3 +95,5 @@ Each can be used any number of times.")
(url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
(provide 'url-nfs)
;;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437

View file

@ -1,7 +1,7 @@
;;; url-ns.el --- Various netscape-ish functions for proxy definitions
;; Author: $Author: fx $
;; Created: $Date: 2000/12/20 21:08:02 $
;; 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, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -104,3 +104,5 @@
(gethash key url-ns-user-prefs default))
(provide 'url-ns)
;;; arch-tag: 69520992-cf97-40b4-9ad1-c866d3cae5bf

View file

@ -1,7 +1,7 @@
;;; url-parse.el --- Uniform Resource Locator parser
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Created: $Date: 2004/04/04 03:10:58 $
;; Version: $Revision: 1.2 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -204,3 +204,5 @@ Format is:
(vector prot user pass host port file refs attr full))))))
(provide 'url-parse)
;;; arch-tag: f338325f-71ab-4bee-93cc-78fb9a03d403

View file

@ -1,7 +1,7 @@
;;; url-privacy.el --- Global history tracking for URL package
;; Author: $Author: fx $
;; Created: $Date: 2001/10/05 17:10:26 $
;; Version: $Revision: 1.4 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -81,3 +81,5 @@
(t nil))))
(provide 'url-privacy)
;;; arch-tag: fdaf95e4-98f0-4680-94c3-f3eadafabe1d

View file

@ -1,7 +1,7 @@
;;; url-proxy.el --- Proxy server support
;; Author: $Author: fx $
;; Created: $Date: 2001/10/11 21:09:35 $
;; Version: $Revision: 1.5 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -76,3 +76,5 @@
(url-http url-using-proxy callback cbargs)))
(provide 'url-proxy)
;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62

View file

@ -1,7 +1,7 @@
;;; url-util.el --- Miscellaneous helper routines for URL library
;; Author: Bill Perry <wmperry@gnu.org>
;; Created: $Date: 2002/04/22 09:16:11 $
;; Version: $Revision: 1.14 $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -485,3 +485,5 @@ Has a preference for looking backward when not directly on a symbol."
(mail-header-extract)))))
(provide 'url-util)
;;; arch-tag: 24352abc-5a5a-412e-90cd-313b26bed5c9

View file

@ -1,7 +1,7 @@
;;; url-vars.el --- Variables for Uniform Resource Locator tool
;; Author: $Author: fx $
;; Created: $Date: 2002/04/22 09:25:02 $
;; Version: $Revision: 1.14 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -432,4 +432,5 @@ This should be set, e.g. by mail user agents rendering HTML to avoid
(provide 'url-vars)
;;; arch-tag: 29205e5f-c5ce-433c-8d5d-38cbaed64b49
;;; url-vars.el ends here

View file

@ -1,6 +1,6 @@
;;; url.el --- Uniform Resource Locator retrieval tool
;; Author: Bill Perry <wmperry@gnu.org>
;; Version: $Revision: 1.15 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -266,4 +266,5 @@ no further processing). URL is either a string or a parsed URL."
(provide 'url)
;;; arch-tag: bc182f1f-d187-4f10-b961-47af2066579a
;;; url.el ends here

View file

@ -4,7 +4,7 @@
;; Author: Bill Perry <wmperry@gnu.org>
;; Maintainer: Bill Perry <wmperry@gnu.org>
;; Version: $Revision: 1.3 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: url, vc
;; GNU Emacs is free software; you can redistribute it and/or modify
@ -175,3 +175,5 @@ It should return a status of either 0 (no differences found), or
;; deleting the resource.
(provide 'vc-dav)
;;; arch-tag: 0a0fb9fe-8190-4c0a-a179-5c291d3a467e