Repair merge conflict
authorjpritikin <jpritikin@df83fd30-4cca-4c36-ab9d-e8b5583ccbd1>
Fri, 4 Apr 2014 10:30:19 +0000 (10:30 +0000)
committerjpritikin <jpritikin@df83fd30-4cca-4c36-ab9d-e8b5583ccbd1>
Fri, 4 Apr 2014 10:30:19 +0000 (10:30 +0000)
commit0acc2228e0aae92cf54c809c1d61fdccf2fd1f28
tree99ddd8da7d467ab44cd92b708974ca0b50343b7b
parentb9656a6293747b5ec81e97268d3b425c118bf8d6
Repair merge conflict

git-svn-id: http://openmx.psyc.virginia.edu/svn/trunk@3276 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1
models/nightly/ETC88.R