ltmatos
diff --git a/‎Flickr4Java/src/com/flickr4java/flickr/Flickr.java‎
Lines changed: 1851 additions & 615 deletions b/‎Flickr4Java/src/com/flickr4java/flickr/Flickr.java‎
Lines changed: 1851 additions & 615 deletions
diff --git a/‎Flickr4Java/src/com/flickr4java/flickr/Flickr.java.bak‎
Lines changed: 605 additions & 0 deletions b/‎Flickr4Java/src/com/flickr4java/flickr/Flickr.java.bak‎
Lines changed: 605 additions & 0 deletions
diff --git a/‎Flickr4Java/src/com/flickr4java/flickr/cameras/Brand.java‎
Lines changed: 78 additions & 0 deletions b/‎Flickr4Java/src/com/flickr4java/flickr/cameras/Brand.java‎
Lines changed: 78 additions & 0 deletions
diff --git a/‎Flickr4Java/src/com/flickr4java/flickr/cameras/Camera.java‎
Lines changed: 171 additions & 0 deletions b/‎Flickr4Java/src/com/flickr4java/flickr/cameras/Camera.java‎
Lines changed: 171 additions & 0 deletions
@@ -0,0 +1,78 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+package com.flickr4java.flickr.cameras;
+
+public class Brand {
+
+    private String id;
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}
+=======
+package com.flickr4java.flickr.cameras;
+
+public class Brand {
+
+    private String id;
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}
+>>>>>>> 8080af10a7f34bdce972d0e96765084e14e113f0
+=======
+package com.flickr4java.flickr.cameras;
+
+public class Brand {
+
+    private String id;
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}
+>>>>>>> 8080af10a7f34bdce972d0e96765084e14e113f0
@@ -0,0 +1,171 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+package com.flickr4java.flickr.cameras;
+
+public class Camera {
+
+    private String id;
+
+    private Details details;
+
+    private String smallImage;
+
+    private String largeImage;
+    
+    private String name;
+
+    public String getSmallImage() {
+        return smallImage;
+    }
+
+    public void setSmallImage(String smallImage) {
+        this.smallImage = smallImage;
+    }
+
+    public String getLargeImage() {
+        return largeImage;
+    }
+
+    public void setLargeImage(String largeImage) {
+        this.largeImage = largeImage;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Details getDetails() {
+        return details;
+    }
+
+    public void setDetails(Details details) {
+        this.details = details;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
+=======
+package com.flickr4java.flickr.cameras;
+
+public class Camera {
+
+    private String id;
+
+    private Details details;
+
+    private String smallImage;
+
+    private String largeImage;
+    
+    private String name;
+
+    public String getSmallImage() {
+        return smallImage;
+    }
+
+    public void setSmallImage(String smallImage) {
+        this.smallImage = smallImage;
+    }
+
+    public String getLargeImage() {
+        return largeImage;
+    }
+
+    public void setLargeImage(String largeImage) {
+        this.largeImage = largeImage;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Details getDetails() {
+        return details;
+    }
+
+    public void setDetails(Details details) {
+        this.details = details;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
+>>>>>>> 8080af10a7f34bdce972d0e96765084e14e113f0
+=======
+package com.flickr4java.flickr.cameras;
+
+public class Camera {
+
+    private String id;
+
+    private Details details;
+
+    private String smallImage;
+
+    private String largeImage;
+    
+    private String name;
+
+    public String getSmallImage() {
+        return smallImage;
+    }
+
+    public void setSmallImage(String smallImage) {
+        this.smallImage = smallImage;
+    }
+
+    public String getLargeImage() {
+        return largeImage;
+    }
+
+    public void setLargeImage(String largeImage) {
+        this.largeImage = largeImage;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Details getDetails() {
+        return details;
+    }
+
+    public void setDetails(Details details) {
+        this.details = details;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
+>>>>>>> 8080af10a7f34bdce972d0e96765084e14e113f0