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

Fix error, when a user switches back to master and then develop. This… #1292

Merged
merged 2 commits into from
Oct 21, 2016

Conversation

p0psicles
Copy link
Contributor

  • PR is based on the DEVELOP branch
  • Don't send big changes all at once. Split up big PRs into multiple smaller PRs that are easier to manage and review
  • Read contribution guide

… will recreate the sickbeard.db and sickrage.log files. Resulting in an exception, because it want to rename them, but main.db does already exist.

fernandog and others added 2 commits October 21, 2016 07:31
* Missed rebranding

* Update CONTRIBUTING.md
… will recreate the sickbeard.db and sickrage.log files. Resulting in an exception, because it want to rename them, but main.db does already exist.
@fernandog fernandog added this to the 0.1.7 milestone Oct 21, 2016
@fernandog fernandog force-pushed the feature/fix-error-when-both-files-exist branch from ac9f69b to 95b9447 Compare October 21, 2016 09:35
@fernandog fernandog merged commit 1454b26 into develop Oct 21, 2016
@fernandog fernandog deleted the feature/fix-error-when-both-files-exist branch October 21, 2016 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants