Skip to content

Commit 26774e0

Browse files
logicboxlogicbox
committed
Resolve missed merge conflicts
1 parent 5053e2c commit 26774e0

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

‎package-lock.json

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

‎package.json

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

0 commit comments

Comments
 (0)