Projects >> Repo1 >>8e66fee6edc036eb1f40ec5992984f55d4255f44

Chunk
Conflicting content 
package com.rooney.Mess.json;

<<<<<<< HEAD
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.AND;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.EQUALS;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.EQUALS_IN;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.FIELD;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.HASVALUE;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.ISTRUE;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.OR;
=======
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.*;

>>>>>>> 076c561db9575581603112acae7c5ffb0a9583e3
/*
 * http://www.mkyong.com/java/json-simple-example-read-and-write-json/
 * https://code.google.com/p/json-simple/wiki/EncodingExamples
Solution content 
package com.rooney.Mess.json;

<<<<<<< HEAD
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.AND;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.EQUALS;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.EQUALS_IN;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.FIELD;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.HASVALUE;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.ISTRUE;
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.OR;
=======
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.*;

>>>>>>> FETCH_HEAD
/*
 * http://www.mkyong.com/java/json-simple-example-read-and-write-json/
 * https://code.google.com/p/json-simple/wiki/EncodingExamples
File
JsonSimpleExample.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 

 */
<<<<<<< HEAD
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.VALUES;

=======
>>>>>>> 076c561db9575581603112acae7c5ffb0a9583e3
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
Solution content 

 */
<<<<<<< HEAD
import static com.rooney.Mess.json.JsonSimpleExample.Keywords.VALUES;

=======
>>>>>>> FETCH_HEAD
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
File
JsonSimpleExample.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter;
import org.codehaus.jackson.map.SerializerProvider;
<<<<<<< HEAD
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;

import com.fasterxml.jackson.datatype.guava.GuavaModule;
=======
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
>>>>>>> 076c561db9575581603112acae7c5ffb0a9583e3


public class JsonSimpleExample {
Solution content 
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter;
import org.codehaus.jackson.map.SerializerProvider;
<<<<<<< HEAD
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;

import com.fasterxml.jackson.datatype.guava.GuavaModule;
=======
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
>>>>>>> FETCH_HEAD


public class JsonSimpleExample {
File
JsonSimpleExample.java
Developer's decision
Manual
Kind of conflict
Import