Skip to content

Commit 5053e2c

Browse files
committed
1.5.0-alpha.0
1 parent a597d9f commit 5053e2c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"name": "onair-cli",
33
"description": "A CLI to display information from OnAir Airline Manager",
4+
<<<<<<< HEAD
45
"version": "1.4.1",
6+
=======
7+
"version": "1.5.0-alpha.0",
8+
>>>>>>> 1.5.0-alpha.0
59
"main": "bin/index.js",
610
"author": {
711
"name": "Will Kelly",

0 commit comments

Comments
 (0)