Skip to content
This repository has been archived by the owner on Jul 29, 2019. It is now read-only.

Textual changes #2158

Merged
merged 1 commit into from
Oct 17, 2016
Merged

Textual changes #2158

merged 1 commit into from
Oct 17, 2016

Conversation

wimrijnders
Copy link
Contributor

Small text fixes to still some niggles:

  • added line to CONTRIBUTING.md to prevent others making the same initial mistake I made.
  • added .directory to .gitignore to prevent these files from showing up (This must bug others also, I can't be the only one using linux).

@mojoaxel
Copy link
Member

added .directory to .gitignore to prevent these files from showing up (This must bug others also, I can't be the only one using linux).

I'm on linux, too. The ".directory" problem is only a Dolphin (KDE) thing.

Copy link
Member

@mojoaxel mojoaxel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@@ -14,6 +14,7 @@ There are a few preferences regarding **code contributions**:
- vis.js follows the node.js code style as described
[here](http://nodeguide.com/style.html).
- When implementing new features, please update the documentation accordingly.
- Make changes in the `develop` branch, not the `master` branch.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;-) the next line makes it clear, but why not!

@mojoaxel mojoaxel merged commit fed0441 into almende:develop Oct 17, 2016
@wimrijnders
Copy link
Contributor Author

Yes, but there must be other dolphin users!

....No, it's not clear enough. It's way too easy to pull straight from master. Which is what I did :-(.

@wimrijnders wimrijnders deleted the PR2 branch October 17, 2016 14:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants