Skip to content

Commit

Permalink
sorry. last commit was sent with compilation errors :( . my bad
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustavo Pinto committed May 9, 2013
1 parent 46905f7 commit 24cdeb1
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/java/main/br/ufpe/cin/groundhog/main/TestMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@
import br.ufpe.cin.groundhog.http.HttpModule;
import br.ufpe.cin.groundhog.http.Requests;
import br.ufpe.cin.groundhog.parser.JavaParser;
<<<<<<< HEAD
import br.ufpe.cin.groundhog.parser.MutableInt;
import br.ufpe.cin.groundhog.scmclient.GitClient;
import br.ufpe.cin.groundhog.scmclient.ScmModule;
=======
>>>>>>> ft-metrics-output-csv
import br.ufpe.cin.groundhog.search.SearchGitHub;
import br.ufpe.cin.groundhog.search.SearchGoogleCode;
import br.ufpe.cin.groundhog.search.SearchModule;
Expand All @@ -39,13 +35,10 @@
import com.google.inject.Guice;
import com.google.inject.Injector;

<<<<<<< HEAD
/**
* The main test class
* @author fjsj, gustavopinto, rodrigoalvesvieira
*/
=======
>>>>>>> ft-metrics-output-csv
public class TestMain {
private static Logger logger = LoggerFactory.getLogger(TestMain.class);

Expand Down

0 comments on commit 24cdeb1

Please sign in to comment.