repositories
/
Persons_Comparator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/sylvain/IdeaProjects/Persons_Comparator with conflicts.
[Persons_Comparator.git]
/
src
/
Country.java
diff --git
a/src/Country.java
b/src/Country.java
index 0dffb2ccd4537d9501d41536eef1b2c2fb64dc1b..08c4da2a88fad39e7be1945a93f02bb4a998d7d1 100644
(file)
--- a/
src/Country.java
+++ b/
src/Country.java
@@
-36,7
+36,7
@@
public class Country {
private String pt;
private String nl;
private String hr;
- private String fa;
+
// Getter Methods
@@
-76,9
+76,7
@@
public class Country {
return hr;
}
- public String getFa() {
- return fa;
- }
+
// Setter Methods
@@
-118,9
+116,7
@@
public class Country {
this.hr = hr;
}
- public void setFa(String fa) {
- this.fa = fa;
- }
+
}