Projects >> websms >>4ec526680abf1bb8a93a48cf1c8c423a0de074d6

Chunk
Conflicting content 
					}
				} else {
					this.pushMessage(WebSMS.MESSAGE_LOG, R.string.log_error_pw);
<<<<<<< HEAD
					return false;
=======
>>>>>>> a0862685e6f42b4bf2bd94337a2dcfa18dd6927c
				}
			}
			response = getHttpClient(URLS[operator][URL_SMSCENTER],
Solution content 
					}
				} else {
					this.pushMessage(WebSMS.MESSAGE_LOG, R.string.log_error_pw);
					return false;
				}
			}
			response = getHttpClient(URLS[operator][URL_SMSCENTER],
File
ConnectorO2.java
Developer's decision
Version 1
Kind of conflict
Return statement
Chunk
Conflicting content 
		case DIALOG_HELP:
			myDialog = new Dialog(this);
			myDialog.setContentView(R.layout.help);
<<<<<<< HEAD
			myDialog.setTitle(R.string.help_);
=======
			myDialog.setTitle(this.getString(R.string.help_));
>>>>>>> a0862685e6f42b4bf2bd94337a2dcfa18dd6927c
			break;
		case DIALOG_UPDATE:
			myDialog = new Dialog(this);
Solution content 
		case DIALOG_HELP:
			myDialog = new Dialog(this);
			myDialog.setContentView(R.layout.help);
			myDialog.setTitle(R.string.help_);
			break;
		case DIALOG_UPDATE:
			myDialog = new Dialog(this);
File
WebSMS.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
				}
				TextView tw = (TextView) WebSMS.this
						.findViewById(R.id.freecount);
<<<<<<< HEAD
				tw.setText(WebSMS.this.getResources().getString(R.string.free_)
						+ " "
						+ WebSMS.remFree
						+ " "
						+ WebSMS.this.getResources().getString(
								R.string.click_for_update));
=======
				tw.setText(WebSMS.this.getString(R.string.free_) + " "
						+ WebSMS.remFree + " "
						+ WebSMS.this.getString(R.string.click_for_update));
>>>>>>> a0862685e6f42b4bf2bd94337a2dcfa18dd6927c
				return;
			case MESSAGE_SETTINGS:
				WebSMS.this.startActivity(new Intent(WebSMS.this,
Solution content 
				}
				TextView tw = (TextView) WebSMS.this
						.findViewById(R.id.freecount);
				tw.setText(WebSMS.this.getString(R.string.free_) + " "
						+ WebSMS.remFree + " "
						+ WebSMS.this.getString(R.string.click_for_update));
				return;
			case MESSAGE_SETTINGS:
				WebSMS.this.startActivity(new Intent(WebSMS.this,
File
WebSMS.java
Developer's decision
Version 2
Kind of conflict
Method invocation