Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I had a few errors I corrected. duplicate entries and bad indentation #121

Merged
merged 6 commits into from
Jul 12, 2017

Conversation

csoleimani
Copy link
Contributor

No description provided.

@pcfens
Copy link
Owner

pcfens commented Jul 12, 2017

It looks like some of this stuff may have already found it's way in. Can you take a look at the current version to see if it will work?

@csoleimani
Copy link
Contributor Author

That was from me, but the indentation is bad and I put ssl certificate and key in twice instead of just once. Also, ssl_key attribute says ssl.certificate. This should fix that

@pcfens
Copy link
Owner

pcfens commented Jul 12, 2017

Oops - I was reading too fast.

Could you try rebasing and fixing the merge conflict? Once that's done it should be easy for me to merge this (and I'll roll a new release afterwards).

@csoleimani
Copy link
Contributor Author

whoops, sorry I think I merged it, but I fixed the conflict

@pcfens pcfens merged commit 6683ba5 into pcfens:master Jul 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants