Commit Graph

1 Commits

Author SHA1 Message Date
Marian Beermann 96fa1e8414 docs: define "ours" merge strategy for auto-generated files 2017-02-12 18:51:40 +01:00
Renamed from docs/usage/general.rst.inc (Browse further)