Fixed conflicts

Author Nikhil Sarda <nikhilsarda.iitkgp@gmail.com>
Author date 2012-08-09 20:48:34
Author local date 2012-08-09 16:48:34 -0400
Committer Nikhil Sarda <nikhilsarda.iitkgp@gmail.com>
Committer date 2012-08-09 20:48:34
Committer local date 2012-08-09 16:48:34 -0400
Commit 66ec5115461465c59673b0a07e12755fbb791ee2
Tree 4d776cbd6bb2c03d0b6cb984f0cfd8fc146a887a
Parent 6d5d5363c83ad78103e458b2e89957dad92f119e
Parent 3bb625359811f1a201c74d38512f6d2881cd5efe
Fixed conflicts

Merge branch 'master' of ssh://ase.cs.columbia.edu/in-vivo

Conflicts:
	testcase-generation-tester/.classpath
	testcase-generation/src/edu/columbia/cs/psl/invivo/record/WallaceExportRunner.java
Affected files: