Dmitry Ivanov e1f362e831 resolve conflicts

2017-04-19 14:05:53 +03:00

..

init-extension.out

…

issue3.out

…

repack_1.out

Fix a mistake of merging.

2017-04-11 23:43:21 +09:00

repack.out

resolve conflicts

2017-04-19 14:05:53 +03:00

tablespace_1.out

…

tablespace.out

…