Projects >> twitter4j >>3a38698babb45aa77487616cdf666a6c10016f65

Chunk
Conflicting content 
     * @return two-letter iso language code
     */
    String getIsoLanguageCode();
<<<<<<< HEAD

    /**
     * Returns the lang of the status text if available.
     *
     * @return two-letter iso language code
     */
    String getLang();
=======
    
    /**
     * Returns the targeting scopes applied to a status.
     *
     * @return the targeting scopes applied to a status.
     */
    Scopes getScopes();
>>>>>>> 940c21996b66a12d106494b2832e1af424cf0763
}
Solution content 
     * @return two-letter iso language code
     */
    String getIsoLanguageCode();

    /**
     * Returns the lang of the status text if available.
     *
     * @return two-letter iso language code
     * @since Twitter4J 3.0.6
     */
    String getLang();

    /**
     * Returns the targeting scopes applied to a status.
     *
     * @return the targeting scopes applied to a status.
     * @since Twitter4J 3.0.6
     */
    Scopes getScopes();
}
File
Status.java
Developer's decision
Manual
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
            		 int len = placeIdsArray.length();
            if (!json.isNull("current_user_retweet")) {
                currentUserRetweetId = json.getJSONObject("current_user_retweet").getLong("id");
            }
<<<<<<< HEAD
            if (!json.isNull("lang")) {
                lang = getUnescapedString("lang", json);
=======
            
            if (!json.isNull("scopes")) {
            	JSONObject scopesJson = json.getJSONObject("scopes");
            	 if (!scopesJson.isNull("place_ids")) {
            		 JSONArray placeIdsArray = scopesJson.getJSONArray("place_ids");
            		 String[] placeIds = new String[len];
            		 for (int i = 0; i < len; i++) {
            			 placeIds[i] = placeIdsArray.getString(i);
            		 }
            		 scopes = new ScopesImpl(placeIds);
            	 }
>>>>>>> 940c21996b66a12d106494b2832e1af424cf0763
            }
        } catch (JSONException jsone) {
            throw new TwitterException(jsone);
Solution content 
            if (!json.isNull("current_user_retweet")) {
                currentUserRetweetId = json.getJSONObject("current_user_retweet").getLong("id");
            }
            if (!json.isNull("lang")) {
                lang = getUnescapedString("lang", json);
            }

            if (!json.isNull("scopes")) {
            	JSONObject scopesJson = json.getJSONObject("scopes");
            	 if (!scopesJson.isNull("place_ids")) {
            		 JSONArray placeIdsArray = scopesJson.getJSONArray("place_ids");
            		 int len = placeIdsArray.length();
            		 String[] placeIds = new String[len];
            		 for (int i = 0; i < len; i++) {
            			 placeIds[i] = placeIdsArray.getString(i);
            		 }
            		 scopes = new ScopesImpl(placeIds);
            	 }
            }
        } catch (JSONException jsone) {
            throw new TwitterException(jsone);
File
StatusJSONImpl.java
Developer's decision
Concatenation
Kind of conflict
Attribute
If statement
Method invocation
Variable