Add basic View support - List the Views; List the tickets in a View

Provide basic functionality for views. Support getting a list of the
Views. Then, using the view id, we can get a list of the Tickets
in the View.

Author: bob

pom.xml

@@ -25,7 +25,7 @@
 
   <groupId>com.cloudbees.thirdparty</groupId>
   <artifactId>zendesk-java-client</artifactId>
-  <version>0.17.2-SNAPSHOT</version>
+  <version>0.17.1-SNAPSHOT</version>
 
   <name>zendesk-java-client</name>
   <description>Java client for the Zendesk API</description>

src/main/java/org/zendesk/client/v2/model/View.java

@@ -8,12 +8,8 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class View implements Serializable {
 
-<<<<<<< HEAD
-    private static final long serialVersionUID = 1L;
-=======
     private static final long serialVersionUID = 8162172428393948830L;
 
->>>>>>> 954b71b... Add basic View support - List the Views; List the tickets in a View
     private long id;
     private String title;
     private boolean active;
@@ -23,10 +19,6 @@ public class View implements Serializable {
     private String description;
     private Conditions conditions;
     private boolean watchable;
-<<<<<<< HEAD
-    private String rawTitle;
-=======
->>>>>>> 954b71b... Add basic View support - List the Views; List the tickets in a View
 
     public void setId(long id) {
         this.id = id;
@@ -109,19 +101,6 @@ public boolean getWatchable() {
         return this.watchable;
     }
 
-<<<<<<< HEAD
-    public void setRawTitle(String rawTitle) {
-        this.rawTitle = rawTitle;
-    }
-
-    @JsonProperty("raw_title")
-    public String getRawTitle() {
-        return this.rawTitle;
-    }
-
-=======
->>>>>>> 954b71b... Add basic View support - List the Views; List the tickets in a View
-    //TODO: fix this.
     public String toString() {
         return "View " +
             "{id=" + id +
@@ -133,10 +112,6 @@ public String toString() {
             ", description=" + description +
             ", conditions=" + conditions +
             ", watchable=" + watchable +
-<<<<<<< HEAD
-            ", rawTitle=" + rawTitle +
-=======
->>>>>>> 954b71b... Add basic View support - List the Views; List the tickets in a View
             "}";
     }
 }