Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Commit 77af42d

Browse files
authored
chore: fix broken merge (#3420)
1 parent 38f823e commit 77af42d

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

tools/example-zipper/exampleZipper.js

-3
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,10 @@ class ExampleZipper {
6565
const jsonFileName = configFileName.replace(/^.*[\\\/]/, '');
6666
const relativeDirName = path.dirname(path.dirname(path.relative(sourceDirName, configFileName)));
6767
const exampleDirName = path.dirname(configFileName);
68-
<<<<<<< 6df8bea575824951ad80a82cb2e1310d4535f085
6968
const examplesPackageJson = 'public/docs/_examples/package.json';
7069
const examplesSystemjsConfig = 'public/docs/_examples/_boilerplate/src/systemjs.config.js';
7170
const examplesSystemjsLoaderConfig = 'public/docs/_examples/_boilerplate/src/systemjs-angular-loader.js';
7271
const exampleTsconfig = 'public/docs/_examples/_boilerplate/src/tsconfig.json';
73-
=======
74-
>>>>>>> chore: better package.json for zipper
7572
let exampleZipName = jsonFileName.replace(/(plnkr|zipper).json/, relativeDirName);
7673
const outputFileName = path.join(outputDirName, relativeDirName, exampleZipName + '.zip');
7774
let defaultIncludes = ['**/*.ts', '**/*.js', '**/*.css', '**/*.html', '**/*.md', '**/*.json', '**/*.png'];

0 commit comments

Comments
 (0)