[GitHub] carbondata pull request #2899: [CARBONDATA-3073][CARBONDATA-3044] Support co...

[xubo245]

Github user xubo245 commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241625744
  
    --- Diff: docs/csdk-guide.md ---
    @@ -214,6 +226,122 @@ release the memory and destroy JVM.
         void withHadoopConf(char *key, char *value);
     ```
     
    +<<<<<<< HEAD
    --- End diff --
    
    sorry, rebase error, rebase many times before


---