Skip to content
Browse files

fixes merge conflict

  • Loading branch information...
2 parents 0ee8e49 + 3b420ff commit c2f45198feb8e48f5b7511d47c59e6a4d46b6d31 @Clancey committed May 29, 2012
Showing with 4 additions and 2 deletions.
  1. BIN .DS_Store
  2. +2 −0 .gitignore
  3. +2 −2 MonoDroid.Dialog/EntryElement.cs
View
BIN .DS_Store
Binary file not shown.
View
2 .gitignore
@@ -26,3 +26,5 @@ Thumbs.db
DialogSampleApp/DialogSampleApp.pidb
MonoDroid.Dialog/MonoDroid.Dialog.pidb
+
+.DS_Store
View
4 MonoDroid.Dialog/EntryElement.cs
@@ -82,9 +82,9 @@ public override View GetView(Context context, View convertView, ViewGroup parent
_entry.Hint = this.Hint;
if (this.Password)
- _entry.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
+ _entry.InputType = (InputTypes.ClassText | InputTypes.TextVariationPassword);
else if (this.Numeric)
- _entry.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
+ _entry.InputType = (InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned);
else
_entry.InputType = InputTypes.ClassText;

0 comments on commit c2f4519

Please sign in to comment.
Something went wrong with that request. Please try again.