fix the conflict in surface.py

Browse source

...

This commit is contained in:

rockfool 2019-09-16 14:12:54 -04:00

parent fbaa780731

commit d0eb84dd4e

1 changed files with 2265 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2265

openmc/surface.py Normal file

View file

File diff suppressed because it is too large Load diff