-
Notifications
You must be signed in to change notification settings - Fork 253
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
dotos
committed
Nov 22, 2017
1 parent
c3c7418
commit a1f423b
Showing
1 changed file
with
0 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,6 @@ | ||
| { | ||
| "name": "valine", | ||
| <<<<<<< HEAD | ||
| "version": "1.1.8-rc2", | ||
| ======= | ||
| "version": "1.1.8-rc", | ||
| >>>>>>> bfff5d5b4a17af8b5161cbdc604d57076db9a47f | ||
| "description": "A simple comment system based on Leancloud.", | ||
| "main": "/src/Valine.js", | ||
| "author": "xCss <[email protected]> (https://github.com/xCss)", | ||
|
|
||