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

sample files: exclude rst from merge conflict detection #645

Merged
merged 1 commit into from Mar 14, 2020

Conversation

sbidoul
Copy link
Member

@sbidoul sbidoul commented Mar 12, 2020

Alternative to @rven 's #620

@sbidoul sbidoul merged commit 9e6d425 into OCA:master Mar 14, 2020
@sbidoul sbidoul deleted the exclude-rst-merge-conflict branch March 14, 2020 10:37
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.

None yet

1 participant