Hi Dominik,

I have a short git result question on you.

I am working in my branch STREAMPIPES-642 and before I pushed my commits, I did 
a rebase on dev.
During this process an odd result came up.
I had to merge a file that I did not touch at all.

As you wrote the code, can you check if I didn't mess up anything?
Still don't know why this message occurs because it has nothing to do with my 
code changes at all.

Sorry for the inconvenience.


https://github.com/apache/streampipes/commits/STREAMPIPES-642/streampipes-data-explorer/src/test/java/org/apache/streampipesdataexplorer/v4/query/writer

Florian

Reply via email to