deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '2.0'

Browse source 
Conflicts:
	Tests/DataFixtures/Dumper/YamlDataDumperTest.php
	Tests/DataFixtures/Loader/YamlDataLoaderTest.php
This commit is contained in:
William DURAND 2012-04-06 12:57:52 +02:00
commit b890706c4e
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/AbstractPropelCommand.php
View file

@ -108,7 +108,7 @@ abstract class AbstractPropelCommand extends ContainerAwareCommand
// build.properties
$this->createBuildPropertiesFile($kernel, $this->cacheDir.'/build.properties');
// buidtime-conf.xml
// buildtime-conf.xml
$this->createBuildTimeFile($this->cacheDir.'/buildtime-conf.xml');
// Verbosity