sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

マージミス

Browse Source
This commit is contained in:
ThinaticSystem 2021-09-05 16:31:44 +09:00
parent e9351dc7d0
commit 42691d6b06
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -1,13 +1,7 @@
{
<<<<<<< HEAD
"name": "honisskey",
"author": "ThinaticSystem <git@thinaticsystem.com>",
"version": "12.90.0",
=======
"name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.90.1",
>>>>>>> upstream/master
"codename": "indigo",
"repository": {
"type": "git",