-
Notifications
You must be signed in to change notification settings - Fork 27
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
Delete simpleSampleData #419
Conversation
The INSTALL.md file needs to be edited - however the same section was edited in the unmerged pr #394. How should I go about editing the file without conflicting the two branches? |
I reckon it will be easier/better to wait until #394 is merged, then edit the file, as even the edits made in 394 need to overridden (as the list wont be needed) |
Can you update the INSTALL.md file now that #394 has been merged 😄 ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just the INSTALL.md change 😄
Yes, I was just thinking that |
ok so my merging and rebasing has gone wrong as usual and there is a conflict after all. |
6c120d5
to
33979f0
Compare
- the simpleSampleData is no longer needed, so can be deleted
- As the simpleSampleData has been deleted, the information about it in INSTALL.md can be deleted - This meant the text about the sample data as a whole needed to be reworded
33979f0
to
aa41a30
Compare
Resolves #415 Merge after #394