external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge leftovers

pull/349/head
Murat Tuncer 2016-02-17 15:44:24 +02:00
parent 3528d7ce85
commit df5851366c
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -44,9 +44,9 @@ clean: clean-csql
# apply or check style # apply or check style
reindent: reindent:
cd ${citusdb_abs_top_srcdir} && citus_indent --quiet cd ${citus_abs_top_srcdir} && citus_indent --quiet
check-style: check-style:
cd ${citusdb_abs_top_srcdir} && citus_indent --quiet --check cd ${citus_abs_top_srcdir} && citus_indent --quiet --check
.PHONY: reindent check-style .PHONY: reindent check-style
# depend on install for now # depend on install for now

7
src/include/distributed/citus_ruleutils.h
View File

@ -1,13 +1,8 @@
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* citus_ruleutils.h * citus_ruleutils.h
<<<<<<< HEAD
* Citus ruleutils wrapper functions and exported PostgreSQL ruleutils * Citus ruleutils wrapper functions and exported PostgreSQL ruleutils
* functions. * functions.
=======
* CitusDB ruleutils wrapper functions and exported PostgreSQL ruleutils
* functions.
>>>>>>> origin
* *
* Copyright (c) 2012-2015, Citus Data, Inc. * Copyright (c) 2012-2015, Citus Data, Inc.
*------------------------------------------------------------------------- *-------------------------------------------------------------------------