From 8a8dc0d3f658fd6835cc995276ca661d61dd78cb Mon Sep 17 00:00:00 2001 From: "Chiko.DOKNINE" Date: Fri, 3 May 2024 20:27:32 +0900 Subject: [PATCH] Fri May 03 2024 20:27:31 GMT+0900 (Japan Standard Time) --- 03/04.txt | 6 +----- manifest.json | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/03/04.txt b/03/04.txt index d9f1985..965f49d 100644 --- a/03/04.txt +++ b/03/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Tetarie, wene Taikou mi kanara uhkwi awi mi timi ruariye wene Noru mi tesi nupupu jupo tete mrowerie wene numanu ta mite kripe, \v 5 Wene Noru mi wene te kai ri mia tire tesi wene wra seinye ka kru peni pe ko, tesi wene Taikou mi kanara mi wene nupupu te ri risare pro ka wene Taikou mi Uhkwi seinye pe ku kai mia tire pro ka, -======= -\v 4 \v tetarie, wene Taikou mi kanara uhkwi awi mi timi ruariye wene Noru mi tesi nupupu jupo tete mrowerie wene numanu ta mite kripe, \v 5 Wene Noru mi wene te kai ri mia tire tesi wene wra seinye ka kru peni pe ko, tesi wene Taikou mi kanara mi wene nupupu te ri risare pro ka wene Taikou mi Uhkwi seinye pe ku kai mia tire pro ka, ->>>>>>> d4078fae36a1ea0198d01bd2f1cb5b29725fb683 +\v 4 tetarie, wene Taikou mi kanara uhkwi awi mi timi ruariye wene Noru mi tesi nupupu jupo tete mrowerie wene numanu ta mite kripe, \v 5 Wene Noru mi wene te kai ri mia tire tesi wene wra seinye ka kru peni pe ko, tesi wene Taikou mi kanara mi wene nupupu te ri risare pro ka wene Taikou mi Uhkwi seinye pe ku kai mia tire pro ka, \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7265a82..ebf2776 100644 --- a/manifest.json +++ b/manifest.json @@ -61,12 +61,12 @@ "03-title", "03-01", "03-03", + "03-04", "03-06", "03-08", "03-09", + "03-12", "03-14", - "03-15", - "03-04", - "03-12" + "03-15" ] } \ No newline at end of file