resolved conflicts with my own branch...

16 years ago · a8b5865663
parent b25e6c21ab e5c677412e
commit a8b5865663
21 changed files with 664 additions and 667 deletions
--- a/astrid/gen/.gitignore
+++ b/astrid/gen/.gitignore
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
@ -644,6 +644,4 @@ public class ProducteevSyncProvider extends SyncProvider<ProducteevTaskContainer
        ((_-83)%27+97):_);return TextUtils.htmlEncode(____==31?___:
        stripslashes(____+1,__.substring(1),___+((char)_)));
    }
-
-
 }
--- a/astrid/res/layout/producteev_login_activity.xml
+++ b/astrid/res/layout/producteev_login_activity.xml
@ -100,5 +100,4 @@
        android:linksClickable="true"
        android:text="@string/producteev_PLA_terms" />
    
-    
 </LinearLayout>
--- a/bin/androidxml2po.bash
+++ b/bin/androidxml2po.bash
--- a/bin/catxml
+++ b/bin/catxml
--- a/bin/migrate-2-to-3
+++ b/bin/migrate-2-to-3
--- a/bin/xml2po.py
+++ b/bin/xml2po.py
--- a/tests/gen/.gitignore
+++ b/tests/gen/.gitignore