-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: update test/index.js merge conflict
- Loading branch information
Charlike Mike Reagent
committed
Nov 30, 2018
1 parent
2762549
commit 627ba30
Showing
1 changed file
with
0 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,7 @@ | ||
| <<<<<<< HEAD | ||
| /** | ||
| * @copyright 2017-present, Charlike Mike Reagent <olsten.larck@gmail.com> | ||
| * @license Apache-2.0 | ||
| */ | ||
|
|
||
| const test = require('mukla') | ||
| const fn = require('../src/index.js') | ||
|
|
||
| test('foo bar', () => { | ||
| test.ok(fn) | ||
| }) | ||
| ======= | ||
| import assert from 'assert'; | ||
| import test from 'asia'; | ||
| import mod from '../src/index'; | ||
|
|
||
| test('todo', () => { | ||
| assert.strictEqual(typeof mod, 'function'); | ||
| }); | ||
| >>>>>>> standard-release-app/master |