Skip to content

BAEL-1155 crdt#2659

Merged
pivovarit merged 4 commits intoeugenp:masterfrom
tomekl007:BAEL-1155_crdt
Oct 6, 2017
Merged

BAEL-1155 crdt#2659
pivovarit merged 4 commits intoeugenp:masterfrom
tomekl007:BAEL-1155_crdt

Conversation

@tomekl007
Copy link
Copy Markdown
Contributor

No description provided.

Copy link
Copy Markdown
Contributor

@KevinGilmore KevinGilmore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change whitespace on existing lines or between existing lines.

<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not alter spacing within or between existing lines. This makes the review take longer than it should, as I have to wade through what is an actual change vs what is only a whitespace change.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was wrong formatted previously. Someone commited wrong style so I want to fix that issue :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood. I've had difficulties with this file recently since the formatting was changed to the wrong style. Several PRs had merge conflicts in this file initially, as is the case here. You'll need to pull down the upstream changes and resolve the merge conflicts and push again :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@pivovarit pivovarit merged commit c521aa6 into eugenp:master Oct 6, 2017
crakdelpol pushed a commit to crakdelpol/tutorials that referenced this pull request Jul 5, 2025
crakdelpol pushed a commit to crakdelpol/tutorials that referenced this pull request Jul 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants