resolved conflicts with my own branch...

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)_)));
     }
-
-
 }

astrid/res/layout/producteev_login_activity.xml

@@ -100,5 +100,4 @@
         android:linksClickable="true"
         android:text="@string/producteev_PLA_terms" />
     
-    
 </LinearLayout>