Projects >> ajah >>204de7180ca7909ebc16b3d758fdeea980814aa4

Chunk
Conflicting content 
 */
package com.ajah.util.net;

<<<<<<< HEAD
import java.io.UnsupportedEncodingException;
=======
import java.math.BigDecimal;
>>>>>>> 52fbc7a4b272710d0e1954fcb2b37f695acea1fe
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
Solution content 
 */
package com.ajah.util.net;

import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
File
HttpURLBuilder.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
		setParam(name, String.valueOf(value));
	}

<<<<<<< HEAD
=======
	public void setParam(String name, BigDecimal value) {
		setParam(name, value.toString());
	}
>>>>>>> 52fbc7a4b272710d0e1954fcb2b37f695acea1fe
}
Solution content 
		setParam(name, String.valueOf(value));
	}

	public void setParam(String name, BigDecimal value) {
		setParam(name, value.toString());
	}
}
File
HttpURLBuilder.java
Developer's decision
Version 2
Kind of conflict
Method declaration