Skip to content
This repository has been archived by the owner on Dec 18, 2020. It is now read-only.

Cleanup config to reduce merge conflicts #471

Merged
merged 4 commits into from
Jul 1, 2015
Merged

Conversation

wachterjohannes
Copy link
Member

tasks:

  • gather feedback for my changes

informations:

q a
Fixed tickets none
BC breaks config => see upgrade.mc
Documentation PR none

@danrot
Copy link
Contributor

danrot commented Jul 1, 2015

@chirimoya Would you also like to have a look? I think this is something critical.

Sulu\Bundle\MediaBundle\Entity\CollectionInterface: Sulu\Bundle\MediaBundle\Entity\Collection
Sulu\Bundle\ContactBundle\Entity\AccountInterface: Sulu\Bundle\ContactBundle\Entity\Account

# doctrine cache providers
Copy link
Member

Choose a reason for hiding this comment

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

Doctrine

@chirimoya
Copy link
Member

ack

@wachterjohannes
Copy link
Member Author

fixed the typo

@wachterjohannes wachterjohannes force-pushed the enhancement/cleanup-config branch from 1686d11 to cc03486 Compare July 1, 2015 11:20
danrot added a commit that referenced this pull request Jul 1, 2015
Cleanup config to reduce merge conflicts
@danrot danrot merged commit 34a0a7c into develop Jul 1, 2015
@danrot danrot removed the review label Jul 1, 2015
@danrot danrot deleted the enhancement/cleanup-config branch July 1, 2015 12:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants