citus/src
Onder Kalaci c4b783b70b Fix Merge Conflict
This commit fixes merge conflicts.
2016-04-26 11:18:47 +03:00
..
backend Fix Merge Conflict 2016-04-26 11:18:47 +03:00
bin Update copyright dates 2016-03-23 17:14:37 -06:00
include Add fast shard pruning path for INSERTs on hash partitioned tables 2016-04-26 11:16:00 +03:00
test/regress Fix Merge Conflict 2016-04-26 11:18:47 +03:00