Vilson Vieira automata
automata
/ noflo.json
Created
December 3, 2014 19:41
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 19:07
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 19:00
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 18:35
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 17:22
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 17:17
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ noflo.json
Created
December 3, 2014 17:13
This file contains hidden or 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
| { | |
| "properties": { | |
| "name": "main", | |
| "id": "test-drawimage/main", | |
| "project": "test-drawimage", | |
| "environment": { | |
| "type": "noflo-nodejs" | |
| }, | |
| "changed": true | |
| }, |
automata
/ gist:6a714bd341efde7c9083
Created
November 20, 2014 17:25
This file contains hidden or 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
| cta vilson$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is ahead of 'origin/master' by 16 commits. | |
| (use "git push" to publish your local commits) | |
| cta vilson$ git log | |
| commit 211377f3a984ec4c19958c576b98e8889f1f718d | |
| Merge: 18ab568 1327874 | |
| Author: Vilson Vieira <vilson@void.cc> | |
| Date: Thu Nov 20 15:18:15 2014 -0200 |
automata
/ gist:57cf5cb1ae350f483dc3
Created
November 20, 2014 17:21
This file contains hidden or 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
| cta vilson$ git flow release finish 0.2.3 | |
| Switched to branch 'develop' | |
| Merge made by the 'recursive' strategy. | |
| Gruntfile.coffee | 2 +- | |
| package.json | 2 +- | |
| 2 files changed, 2 insertions(+), 2 deletions(-) | |
| Deleted branch release/0.2.3 (was 1327874). | |
| Summary of actions: | |
| - Latest objects have been fetched from 'origin' |
automata
/ gist:ccfa34ba9377e5ae8de1
Created
November 19, 2014 17:07
This file contains hidden or 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
| MacBook-Pro-de-Vilson:cta vilson$ git flow release finish 0.2.3 | |
| Switched to branch 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| Auto-merging package.json | |
| CONFLICT (content): Merge conflict in package.json | |
| Auto-merging Gruntfile.coffee | |
| CONFLICT (content): Merge conflict in Gruntfile.coffee | |
| Automatic merge failed; fix conflicts and then commit the result. | |
| There were merge conflicts. |