Resoved merge conflict

AzureSDKAutomation · Jan 12, 2022 · d890a89 · d890a89
1 parent a64fa41
commit d890a89
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/common/tools/dev-tool/src/commands/run/testBrowser.ts b/common/tools/dev-tool/src/commands/run/testBrowser.ts
@@ -6,28 +6,13 @@ import { runTestsWithProxyTool } from "../../util/testUtils";
 
 export const commandInfo = makeCommandInfo(
   "test:browser",
-<<<<<<< HEAD
-  "runs the browser tests using karma with the default and the provided options; starts the proxy-tool in record and playback modes",
-  {
-    karma: {
-      kind: "string",
-      description: "Karma options (such as --single-run)",
-      default: "--single-run",
-    },
-  }
-=======
   "runs the browser tests using karma with the default and the provided options; starts the proxy-tool in record and playback modes"
->>>>>>> upstream/main
 );
 
 export default leafCommand(commandInfo, async (options) => {
   const karmaArgs = options["--"]?.length ? options["--"]?.join(" ") : "--single-run";
   return runTestsWithProxyTool({
-<<<<<<< HEAD
-    command: `karma start ${options.karma}`,
-=======
     command: `karma start ${karmaArgs}`,
->>>>>>> upstream/main
     name: "browser-tests",
   });
 });
diff --git a/common/tools/dev-tool/src/config/rollup.base.config.ts b/common/tools/dev-tool/src/config/rollup.base.config.ts
@@ -180,11 +180,7 @@ export function makeConfig(
     ],
     output: { file: "dist/index.js", format: "cjs", sourcemap: true },
     preserveSymlinks: false,
-<<<<<<< HEAD
     plugins: [sourcemaps(), nodeResolve(), cjs(), json()],
-=======
-    plugins: [sourcemaps(), nodeResolve(), cjs()],
->>>>>>> upstream/main
   };
 
   const config: RollupOptions[] = [baseConfig as RollupOptions];