Revision 06c8a37e5816f2431b469b37961588f494fefcd4 authored by Brad King on 13 September 2017, 19:09:36 UTC, committed by Brad King on 13 September 2017, 19:09:36 UTC
Use the "ours" merge strategy because we already have equivalent changes on our side.
| File | Mode | Size |
|---|---|---|
| LGPLv2.1.txt | -rw-r--r-- | 25.9 KB |
| LGPLv3.txt | -rw-r--r-- | 7.5 KB |
| README.rst | -rw-r--r-- | 242 bytes |
Computing file changes ...
