Created
September 11, 2019 02:52
-
-
Save morphatic/c934b23fdc8c03094e736ca16d122206 to your computer and use it in GitHub Desktop.
Output of merging dev to master
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
➜ v-address-fields git:(dev) $ git status | |
On branch dev | |
Your branch is up to date with 'origin/dev'. | |
nothing to commit, working tree clean | |
➜ v-address-fields git:(dev) $ git checkout master | |
Switched to branch 'master' | |
Your branch is ahead of 'origin/master' by 1 commit. | |
(use "git push" to publish your local commits) | |
➜ v-address-fields git:(master) $ git status | |
On branch master | |
Your branch is ahead of 'origin/master' by 1 commit. | |
(use "git push" to publish your local commits) | |
nothing to commit, working tree clean | |
➜ v-address-fields git:(master) $ git merge dev | |
Updating ddb0875..d410363 | |
Fast-forward | |
.gitignore | 5 +- | |
README.md | 84 +++++++++++++ | |
dev/App.vue | 12 +- | |
dist/v-address-fields.css | 4 +- | |
dist/v-address-fields.js | 621 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- | |
dist/v-address-fields.js.map | 2 +- | |
dist/v-address-fields.min.css | 4 +- | |
dist/v-address-fields.min.js | 4 +- | |
es5/VStateSelect.js | 82 ++++++++----- | |
es5/VStateSelect.js.map | 2 +- | |
es5/index.js | 2 +- | |
es5/index.js.map | 2 +- | |
lib/VStateSelect.js | 69 +++++++---- | |
lib/VStateSelect.js.map | 2 +- | |
lib/index.js | 2 +- | |
lib/index.js.map | 2 +- | |
package.json | 3 + | |
src/VStateSelect.ts | 58 ++++++--- | |
src/__tests__/VStateSelect.spec.ts | 70 ++++++----- | |
src/__tests__/__snapshots__/VStateSelect.spec.ts.snap | 26 +++- | |
src/node_modules/usa-states/index.d.ts | 42 +++++++ | |
yarn.lock | 7 +- | |
22 files changed, 963 insertions(+), 142 deletions(-) | |
create mode 100644 src/node_modules/usa-states/index.d.ts | |
➜ v-address-fields git:(master) $ git push | |
Counting objects: 3, done. | |
Delta compression using up to 16 threads. | |
Compressing objects: 100% (3/3), done. | |
Writing objects: 100% (3/3), 302 bytes | 302.00 KiB/s, done. | |
Total 3 (delta 2), reused 0 (delta 0) | |
remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
To https://github.com/morphatic/v-address-fields.git | |
3240b8c..6180942 master -> master | |
➜ v-address-fields git:(master) $ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment