| Chunk |
|---|
| Conflicting content |
|---|
this.articleContent = articleContent;
}
<<<<<<< HEAD
public String getArticleTitle() {
return articleTitle;
}
public void setArticleTitle(String articleTopic) {
this.articleTitle = articleTopic;
=======
/**
* Get topic of article
* @return topic of article
*/
public String getArticleTopic() {
return articleTopic;
}
/**
* Set topic for an article
* @param articleTopic topic of article
*/
public void setArticleTopic(String articleTopic) {
this.articleTopic = articleTopic;
>>>>>>> 589c44ed6a5fe7d0608c836cacd088a112cd1f3d
}
/** |
| Solution content |
|---|
this.articleContent = articleContent;
}
/**
* Get topic of article
* @return topic of article
*/
public String getArticleTitle() {
return articleTitle;
}
/**
* Set topic for an article
* @param articleTitle topic of article
*/
public void setArticleTitle(String articleTitle) {
this.articleTitle = articleTitle;
}
/** |
| File |
|---|
| Article.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method declaration |
| Method signature |
| Variable |