diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-02-08 16:22:20 -0500 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-02-08 16:22:20 -0500 |
commit | 0bc0bd07d41169d6de513967615ad9cb3d0f322e (patch) | |
tree | 0f64c9f43a8228d8348ebcfa6a4bef46e0d4ae19 /src/backend/commands/extension.c | |
parent | d9572c4e3b474031060189050e14ef384b94e001 (diff) | |
download | postgresql-0bc0bd07d41169d6de513967615ad9cb3d0f322e.tar.gz postgresql-0bc0bd07d41169d6de513967615ad9cb3d0f322e.zip |
Fix merge conflict.
Diffstat (limited to 'src/backend/commands/extension.c')
0 files changed, 0 insertions, 0 deletions