Merge conflict fix

oven-sh · Apr 5, 2024 · 20085d8 · 20085d8
1 parent 5735fea
commit 20085d8
Showing 1 changed file with 0 additions and 58 deletions.
diff --git a/packages/bun-types/overrides.d.ts b/packages/bun-types/overrides.d.ts
@@ -120,64 +120,6 @@ declare module "util" {
     | "reset"
     | "strikethrough"
     | "underline";
-=======
-declare module 'util' {
-  // https://nodejs.org/docs/latest/api/util.html#foreground-colors
-  type ForegroundColors =
-    | 'black'
-    | 'blackBright'
-    | 'blue'
-    | 'blueBright'
-    | 'cyan'
-    | 'cyanBright'
-    | 'gray'
-    | 'green'
-    | 'greenBright'
-    | 'grey'
-    | 'magenta'
-    | 'magentaBright'
-    | 'red'
-    | 'redBright'
-    | 'white'
-    | 'whiteBright'
-    | 'yellow'
-    | 'yellowBright';
-
-  // https://nodejs.org/docs/latest/api/util.html#background-colors
-  type BackgroundColors =
-    | 'bgBlack'
-    | 'bgBlackBright'
-    | 'bgBlue'
-    | 'bgBlueBright'
-    | 'bgCyan'
-    | 'bgCyanBright'
-    | 'bgGray'
-    | 'bgGreen'
-    | 'bgGreenBright'
-    | 'bgGrey'
-    | 'bgMagenta'
-    | 'bgMagentaBright'
-    | 'bgRed'
-    | 'bgRedBright'
-    | 'bgWhite'
-    | 'bgWhiteBright'
-    | 'bgYellow'
-    | 'bgYellowBright';
-
-  // https://nodejs.org/docs/latest/api/util.html#modifiers
-  type Modifiers =
-    | 'blink'
-    | 'bold'
-    | 'dim'
-    | 'doubleunderline'
-    | 'framed'
-    | 'hidden'
-    | 'inverse'
-    | 'italic'
-    | 'overlined'
-    | 'reset'
-    | 'strikethrough'
-    | 'underline';
 
   function styleText(format: ForegroundColors | BackgroundColors | Modifiers, text: string): string;
 }