clawpack/amrclaw — pull request #28 by rjleveque (2012-11-21 21:36:13+00:00)
Title: Fixed conflict statements in swirl/setrun.py

An unresolved version was committed.