Mercurial > bootstrap
diff bootstrap.ur @ 4:146d77161cb9
Fix bootstrap/bootstrap3 conflicts.
author | Patrick Hurst <phurst@mit.edu> |
---|---|
date | Thu, 05 Dec 2013 16:49:06 -0500 |
parents | e2ddf4cb96cc |
children |
author | Patrick Hurst <phurst@mit.edu> |
---|---|
date | Thu, 05 Dec 2013 16:49:06 -0500 |
parents | e2ddf4cb96cc |
children |