# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 7 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 11 commits.
# The first commit's message is:
Event Documentation

fixe typo

Fix typo

Fix typos

Fix typos

Fix typos

Yaml to XML in configuration

Indent XML

Indent XML (2)

Indent XML (3)

Event Documentation

Fix typo

Fix typos

Fix typos

Yaml to XML in configuration

Indent XML

Indent XML (3)

Conflicts:
	bundles/SyliusResourceBundle/events.rst

conflict

Fix typo

Fix typos

Fix typos

conflict

Yaml to XML in configuration

Indent XML

Indent XML (2)

Indent XML (3)

conflict

conflict

conflict

resolve conflict

resolve conflict

Fix typos

Fix typos

resolve conflict

resolve conflict

Indent XML (3)

resolve conflict

# This is the 2nd commit message:

# This is a combination of 4 commits.
# The first commit's message is:
resolve conflict

# This is the 2nd commit message:

Fix typo

# This is the 3rd commit message:

Fix typos

# This is the 4th commit message:

Fix typos

# This is the 3rd commit message:

# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
resolve conflict

# This is the 2nd commit message:

Indent XML (3)

# This is the 3rd commit message:

Event Documentation

# This is the 2nd commit message:

Fix typo

# This is the 3rd commit message:

Fix typos

# This is the 4th commit message:

# This is a combination of 3 commits.
# The first commit's message is:
resolve conflict

# This is the 2nd commit message:

Yaml to XML in configuration

# This is the 3rd commit message:

Indent XML

# This is the 5th commit message:

# This is a combination of 2 commits.
# The first commit's message is:

resolve conflict

# This is the 2nd commit message:

Indent XML (3)

# This is the 6th commit message:

# This is a combination of 3 commits.
# The first commit's message is:
resolve conflict

# This is the 2nd commit message:

Fix typos

# This is the 3rd commit message:

Fix typos

# This is the 7th commit message:

# This is a combination of 2 commits.
# The first commit's message is:

resolve conflict

# This is the 2nd commit message:

Indent XML (3)

# This is the 8th commit message:

Yaml to XML in configuration

# This is the 9th commit message:

Indent XML

# This is the 10th commit message:

Indent XML (2)

# This is the 11th commit message:

Indent XML (3)

# This is the 2nd commit message:

resolve conflict

# This is the 2nd commit message:

# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
resolve conflict

# This is the 2nd commit message:

Indent XML (3)

# This is the 3rd commit message:

Event Documentation

# This is the 2nd commit message:

Fix typo

# This is the 3rd commit message:

Fix typos

# This is the 2nd commit message:

# This is a combination of 2 commits.

Conflicts:
	bundles/SyliusResourceBundle/events.rst

# This is the 3rd commit message:

# This is a combination of 4 commits.
# The first commit's message is:
conflict

# This is the 2nd commit message:

Fix typo

# This is the 3rd commit message:

Fix typos

# This is the 4th commit message:

Fix typos

# This is the 4th commit message:

# This is a combination of 5 commits.
# The first commit's message is:
conflict

# This is the 2nd commit message:

Yaml to XML in configuration

# This is the 3rd commit message:

Indent XML

# This is the 4th commit message:

Indent XML (2)

# This is the 5th commit message:

Indent XML (3)

# This is the 5th commit message:

conflict

# This is the 6th commit message:

conflict

# This is the 7th commit message:

conflict

# This is the 2nd commit message:

# This is a combination of 2 commits.
# The first commit's message is:

resolve conflict

# This is the 2nd commit message:

Indent XML (3)

# This is the 2nd commit message:

Indent XML (3)

# This is the 2nd commit message:

Indent XML (3)