diff options
author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
---|---|---|
committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/aux-fixed/2800.mdb.src | |
parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/aux-fixed/2800.mdb.src')
-rw-r--r-- | test/aux-fixed/2800.mdb.src | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/aux-fixed/2800.mdb.src b/test/aux-fixed/2800.mdb.src new file mode 100644 index 000000000..957952720 --- /dev/null +++ b/test/aux-fixed/2800.mdb.src @@ -0,0 +1,3 @@ +first: data for first +second: A=1 B=2 +third: A1:B2:C3 |