(custom-initialize-safe-set, custom-initialize-safe-default): Doc fixes.

[gnu-emacs] / lisp / smerge-mode.el

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9e129c3571d83d8fc0d7f107372511552e7ad09b..45e68750cb331784fdd913031d4d726ee6c3ca2c 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary: