Skip to content

Commit 19fa34b

Browse files
committed
fix: resolve merge conflict in cli.ts, bump to 0.0.8
1 parent 640ee2c commit 19fa34b

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

packages/react-doctor/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# react-doctor
22

3+
## 0.0.8
4+
5+
### Patch Changes
6+
7+
- react doctor
8+
39
## 0.0.7
410

511
### Patch Changes

packages/react-doctor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-doctor",
3-
"version": "0.0.7",
3+
"version": "0.0.8",
44
"bin": {
55
"react-doctor": "./dist/cli.js"
66
},

packages/react-doctor/src/cli.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,6 @@ const program = new Command()
5454
scoreOnly: isScoreOnly,
5555
};
5656

57-
<<<<<<< Updated upstream
58-
const shouldSkipPrompts =
59-
flags.yes ||
60-
Boolean(process.env.CI) ||
61-
Boolean(process.env.CLAUDECODE) ||
62-
Boolean(process.env.CURSOR_TRACE_ID) ||
63-
Boolean(process.env.CURSOR_AGENT) ||
64-
Boolean(process.env.CODEX_CI) ||
65-
Boolean(process.env.OPENCODE) ||
66-
Boolean(process.env.AMP_HOME) ||
67-
Boolean(process.env.AMI) ||
68-
!process.stdin.isTTY;
69-
=======
7057
const isAutomatedEnvironment = [
7158
process.env.CI,
7259
process.env.CLAUDECODE,
@@ -78,7 +65,6 @@ const program = new Command()
7865
process.env.AMI,
7966
].some(Boolean);
8067
const shouldSkipPrompts = flags.yes || isAutomatedEnvironment || !process.stdin.isTTY;
81-
>>>>>>> Stashed changes
8268
const projectDirectories = await selectProjects(
8369
resolvedDirectory,
8470
flags.project,

0 commit comments

Comments
 (0)