diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-27 11:03:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 11:03:03 -0500 |
| commit | bc7df1734f88dfe7e55f56f52d593ff129ec2282 (patch) | |
| tree | 23f9bb330eb5d043012a9386f4cde6dcdcee583c /pkgs/development/python-modules/python-sql | |
| parent | cd7047c46169b935719ed5f19f693d97bd760ec7 (diff) | |
gitattributes: disable merge=union in all-packages
This would lead to some merge issues occasionally.
Diffstat (limited to 'pkgs/development/python-modules/python-sql')
0 files changed, 0 insertions, 0 deletions