Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

into develop Conflicts: test/phpunit/PricesTest.php
Dolibarr · Jan 12, 2012 · d45a473 · d45a473
2 parents d79c9dd + 84d1ef2
commit d45a473
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
@@ -196,4 +196,4 @@ public function testUpdatePrice()
     }
 
 }
-?>
+?>