Projects >> calabash-android >>ee1fdd151c094197503e2679f14977924a43546d

Chunk
Conflicting content 
			int x = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("left"));
			int y = (int)translateCoordToScreen(webviewLocation[1], scale, rectangle.get("top"));

<<<<<<< HEAD
            int width = (int)translateCoordToScreen(0, scale, rectangle.get("width"));
            int height = (int)translateCoordToScreen(0, scale, rectangle.get("height"));
=======
			int width = (int)translateCoordToScreen(0, scale, rectangle.get("width"));
			int height = (int)translateCoordToScreen(0, scale, rectangle.get("height"));
>>>>>>> 639015711cf1b6bf3c4f7d85b80c8b71f19539f7
			Map result = new HashMap(rectangle);

			result.put("x", x);
Solution content 
			int x = (int)translateCoordToScreen(webviewLocation[0], scale, rectangle.get("left"));
			int y = (int)translateCoordToScreen(webviewLocation[1], scale, rectangle.get("top"));

            int width = (int)translateCoordToScreen(0, scale, rectangle.get("width"));
            int height = (int)translateCoordToScreen(0, scale, rectangle.get("height"));

			Map result = new HashMap(rectangle);

			result.put("x", x);
File
QueryHelper.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Variable
Chunk
Conflicting content 
			result.put("y", y);
			result.put("center_x", center_x);
			result.put("center_y", center_y);
<<<<<<< HEAD
            result.put("width", width);
            result.put("height", height);
=======
			result.put("width", width);
			result.put("height", height);
>>>>>>> 639015711cf1b6bf3c4f7d85b80c8b71f19539f7

			return result;
		} catch (Exception e) {
Solution content 
			result.put("y", y);
			result.put("center_x", center_x);
			result.put("center_y", center_y);
            
            result.put("width", width);
            result.put("height", height);

			return result;
		} catch (Exception e) {
File
QueryHelper.java
Developer's decision
Version 1
Kind of conflict
Method invocation