From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 21 Sep 2022 00:44:08 +0000 (+0900)
Subject: Merge branch 'master' into single-inheritance
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=67bf15042f8696c8348d1a2e528cf7e9e7afe597;p=chise%2Fxemacs-chise.git

Merge branch 'master' into single-inheritance
---

67bf15042f8696c8348d1a2e528cf7e9e7afe597
diff --cc lisp/utf-2000/chise-subr.el
index 8f948a7,8f8eab5..dc26fc0
--- a/lisp/utf-2000/chise-subr.el
+++ b/lisp/utf-2000/chise-subr.el
@@@ -1,7 -1,7 +1,11 @@@
  ;;; chise-subr.el --- basic lisp subroutines for XEmacs CHISE
  
  ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
++<<<<<<< HEAD
 +;;   2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2021 MORIOKA Tomohiko.
++=======
+ ;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021, 2022 MORIOKA Tomohiko.
++>>>>>>> master
  
  ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
  ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.