Projects >> Mario-AI-Competition-2009 >>783738dbbad3917de48b6b498569e9c219ee6d25

Chunk
Conflicting content 
//If you're using Eclipse, you should expand this import statement.
import ch.idsia.ai.agents.Agent;
import ch.idsia.ai.agents.RegisterableAgent;
<<<<<<< HEAD
import com.reddit.programming.mario.HardcodedAgent; // This line imports your interface agent.
=======
import com.reddit.programming.mario.HardcodedAgent;// This line imports your interface agent.
>>>>>>> eea15cea8b66ab104e62316c54008b8cd657bbcc

import ch.idsia.ai.agents.Agent;
import ch.idsia.ai.agents.RegisterableAgent;
Solution content 
//If you're using Eclipse, you should expand this import statement.
import ch.idsia.ai.agents.Agent;
import ch.idsia.ai.agents.RegisterableAgent;
import com.reddit.programming.mario.HardcodedAgent;// This line imports your interface agent.

import ch.idsia.ai.agents.Agent;
import ch.idsia.ai.agents.RegisterableAgent;
File
Play.java
Developer's decision
Version 1
Kind of conflict
Comment
Import