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

[ajantha-bhat]

Github user ajantha-bhat commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/2899#discussion_r241311890
  
    --- Diff: docs/csdk-guide.md ---
    @@ -214,6 +226,122 @@ release the memory and destroy JVM.
         void withHadoopConf(char *key, char *value);
     ```
     
    +<<<<<<< HEAD
    --- End diff --
    
    what's this?
    
    problem while resolving a conflict? please check and redo this file.


---