diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 12:42:57 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 12:42:57 +0000 |
| commit | 21af53483f83d91e69fec7097ecbe9e1524ca30c (patch) | |
| tree | a920b70f94a55253c56ffa88aa4b6e9f355f5fb0 | |
| parent | 8fc350954d7db40dc5bc4899f7925a46e4cb86e6 (diff) | |
| download | scala-21af53483f83d91e69fec7097ecbe9e1524ca30c.tar.gz scala-21af53483f83d91e69fec7097ecbe9e1524ca30c.tar.bz2 scala-21af53483f83d91e69fec7097ecbe9e1524ca30c.zip | |
resolved leftover conflict from 22901 (porting ...
resolved leftover conflict from 22901 (porting 22462)
| -rw-r--r-- | build.xml | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -996,13 +996,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> -<<<<<<< .working - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - </compilationpath> -======= <compilationpath refid="strap.compilation.path"/> ->>>>>>> .merge-right.r22462 </scalacfork> <scalacfork destdir="${build-strap.dir}/classes/library" |