From: j8takagi <j8takagi@nifty.com>
Date: Mon, 25 May 2026 15:00:59 +0000 (+0900)
Subject: merge
X-Git-Url: https://www.j8takagi.net/gitweb?a=commitdiff_plain;h=d23344ffa204fe335bb5c3cadec280e341791cd6;p=yacasl2.git

merge
---

d23344ffa204fe335bb5c3cadec280e341791cd6
diff --cc VERSION
index 9252d5b,1f3d544..31ba210
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +v0.5p34
++=======
+ v0.5p32
++>>>>>>> c004486105922ebaf46798163458308d7f300d2c