Merge branch 'master' of https://git01.codeplex.com/keepass2android

Conflicts: src/Kp2aUnitTests/TestCreateDb.cs
2013-06-19 05:33:57 +02:00
parent 533c6f207e 6588340b2f
commit 0435ad54ca
1 changed files with 1 additions and 1 deletions
--- a/src/Kp2aUnitTests/TestCreateDb.cs
+++ b/src/Kp2aUnitTests/TestCreateDb.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Android.App;