partkeepr

commit 9f604876578c1bf1310b9caac1fd282c695b3d03
parent a7d7a82e765319ab66a28027e780eda4ab3dd9a4
Author: Felicitus <felicitus@felicitus.org>
Date:   Wed, 29 Jun 2011 05:32:11 +0200

Merge branch 'master' of github.com:partkeepr/PartKeepr

Conflicts:
	testing/SetupDatabase.php

Diffstat:
M
testing/SetupDatabase.php
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/testing/SetupDatabase.php b/testing/SetupDatabase.php
@@ -115,7 +115,6 @@ $user->setUsername("admin");
 $user->setPassword("admin");
 $user->setAdmin(true);
 PartKeepr::getEM()->persist($user);
-PartKeepr::getEM()->flush();
 
 PartUnitSetup::setupPartUnits();
 PartKeepr::getEM()->flush();