search

QuazarTech / DG_Maxwell

Solution of Maxwell equations using Discontinuous Galerkin method.
GNU General Public License v3.0
9 stars 5 forks source link

Unresolved conflict section present in the code #68

Closed amanabt closed 7 years ago

amanabt commented 7 years ago

Commit: 4145945c8aa2644dd9103f18fe8f2b31a373d744

In the test_utils module, line 142 the conflict tag is still present. This is one of the causes of unit tests to fail.

Resolve the conflict.

Balavarun5 commented 7 years ago

Resolved in 5c71deba7742ef079cadf45512c9984bf769c695