invisi/bull
1
0
Fork 0
mirror of https://github.com/OptimalBits/bull.git synced 2026-07-02 08:27:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Manuel Astudillo
2017-05-09 17:10:40 +02:00
parent 4c5c34d1ef
commit e3313fb8b2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-4
View File
@@ -1,10 +1,6 @@
{
"name": "bull",
<<<<<<< HEAD
"version": "3.0.0-alpha.3",
=======
"version": "3.0.0-alpha.4",
>>>>>>> 9fa6d0445c5c3cf5d09d049ea45d0923871adb58
"description": "Job manager",
"main": "./lib/queue",
"repository": {