From 8c6cdfc6131b53ee759e90d166561c7c7cb30b8f Mon Sep 17 00:00:00 2001 From: mits Date: Tue, 10 Dec 2002 16:05:22 +0000 Subject: [PATCH] Conflict solved --- lang/ja/assignment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ja/assignment.php b/lang/ja/assignment.php index c6a9eb105d..b1846e2658 100644 --- a/lang/ja/assignment.php +++ b/lang/ja/assignment.php @@ -1 +1 @@ - \ No newline at end of file + -- 2.39.5