Projects information

Chunk

Conflicting content
import java.util.List; import com.flickr4java.flickr.auth.Auth; <<<<<<< HEAD ======= import com.flickr4java.flickr.photos.Extras; >>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20 /** * A thread local variable used to hold contextual information used in requests. To get an instance of this class use

Conflicting content

import java.util.List;

import com.flickr4java.flickr.auth.Auth;
<<<<<<< HEAD
=======
import com.flickr4java.flickr.photos.Extras;
>>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20

/**
 * A thread local variable used to hold contextual information used in requests.  To get an instance of this class use

Solution content
import java.util.List; import com.flickr4java.flickr.auth.Auth; import com.flickr4java.flickr.photos.Extras; /** * A thread local variable used to hold contextual information used in requests. To get an instance of this class use

Solution content

import java.util.List;

import com.flickr4java.flickr.auth.Auth;
import com.flickr4java.flickr.photos.Extras;

/**
 * A thread local variable used to hold contextual information used in requests.  To get an instance of this class use

File
RequestContext.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
private Auth auth; private String sharedSecret; <<<<<<< HEAD private List extras; ======= private List extras; >>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20 /** * Get the RequestContext instance for the current Thread.

Conflicting content

    private Auth auth;
    private String sharedSecret;
<<<<<<< HEAD
    private List extras;
=======
    private List extras;
>>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20

    /**
     * Get the RequestContext instance for the current Thread.

Solution content
private Auth auth; private String sharedSecret; private List extras; /** * Get the RequestContext instance for the current Thread.

File
RequestContext.java

Developer's decision
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content
* * @return List of extra return values requested */ <<<<<<< HEAD public List getExtras() { if (extras == null) { extras = new ArrayList(); ======= public List getExtras() { if (extras == null) { extras = new ArrayList(); >>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20 } return extras; }

Conflicting content

     *
     * @return List of extra return values requested
     */
<<<<<<< HEAD
    public List getExtras() {
        if (extras == null)
        {
            extras = new ArrayList();
=======
    public List getExtras() {
        if (extras == null)
        {
            extras = new ArrayList();
>>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20
        }
        return extras;
    }

Solution content
* * @return List of extra return values requested */ public List getExtras() { if (extras == null) { extras = new ArrayList(); } return extras; }

File
RequestContext.java

Developer's decision
Version 1

Kind of conflict
Attribute
If statement
Method invocation
Method signature

Chunk

Conflicting content
return extras; } <<<<<<< HEAD public void setExtras(List extras) { ======= public void setExtras(List extras) { >>>>>>> fddb0b97c9645a28c50576c6464ab4138046bd20 this.extras = extras; }

Solution content
return extras; } public void setExtras(List extras) { this.extras = extras; }

File
RequestContext.java

Developer's decision
Version 1

Kind of conflict
Method signature

Projects >> Flickr4Java >>7801181c0b46ee75099ca39560a166aab1a0a5c0