Projects >> game-api-android >>9eb8e4771d90ce8a9837f197ea320ff6e93893b0

Chunk
Conflicting content
	public void update() {
		super.update();
		this.scoreDisplay.setTextString(
<<<<<<< HEAD
				"Score: " + String.valueOf(this.vis.score));
=======
				"Score: " + String.valueOf(this.vis.getScore()));
		//this.scoreDisplay.setWidgetWidth(20);
		this.scoreDisplay.setWidgetHeight(60);
		this.scoreDisplay.setWidgetBackgroundColor(Color.WHITE);
		this.scoreDisplay.setWidgetX(10);
		this.scoreDisplay.setWidgetY(10);
		// If you want to modify the layout of a dashboard widget,
		// you need to so so using its run method.
		this.scoreDisplay.run(new Runnable(){
			public void run() {
				scoreDisplay.setPadding(10, 10, 10, 10);
			}
		});
>>>>>>> 12275d41ec73ac52ad685a2b037eb6db6bed78cc
	}
}
Solution content
	public void update() {
		super.update();
		this.scoreDisplay.setTextString(
				"Score: " + String.valueOf(this.vis.getScore()));
	}
}
File
Vissenkom.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation