fixes merge conflict

kevinmcmahon · May 29, 2012 · c2f4519 · c2f4519
2 parents 0ee8e49 + 3b420ff
commit c2f4519
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,5 @@ Thumbs.db
 DialogSampleApp/DialogSampleApp.pidb
 
 MonoDroid.Dialog/MonoDroid.Dialog.pidb
+
+.DS_Store
diff --git a/MonoDroid.Dialog/EntryElement.cs b/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;