Skip to content

Commit 9f60cad

Browse files
committed
resolve merge conflict in composer.json
1 parent f457a3d commit 9f60cad

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"hhvm/hsl": "^4.25",
1212
"hhvm/hsl-experimental": "^4.93",
1313
"facebook/fbmarkdown": "^1.0",
14-
"facebook/hh-apidoc": ">=0.6 <0.8"
14+
"facebook/hh-apidoc": "^0.8"
1515
},
1616
"require-dev": {
1717
"hhvm/hhast": "^4.0",

composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)