(ewoc--node-branch): Merge into unique caller.

[gnu-emacs] / lisp / userlock.el

diff --git a/lisp/userlock.el b/lisp/userlock.el
index 5e2f337db07f2c00d7cd750103730b4166c28cc1..8a539daace841332fda4c82fa8de67dbcd17280c 100644 (file)
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,6 +1,7 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
-;; Copyright (C) 1985, 1986 Free Software Foundation, inc.
+;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal