rerun

Former-commit-id: d876ce9accdd1c54384d5d501b664dc97b6aef61

examples/scripts/sellar_problem.py

@@ -124,12 +124,8 @@ rcg.add_dc_performance_info('F2',precision=20,fidelity_level=2,run_time=1.5)
 function_order = ['A', 'D1', 'D2', 'D3', 'F1', 'F2', 'G1', 'G2']
 
 # Create a DSM visualization of the RCG
-<<<<<<< HEAD
 rcg.create_dsm(file_name='RCG', function_order=function_order, include_system_vars=True, destination_folder=pdf_dir,
-               keep_tex_file=False, compile_pdf=True)
-=======
-rcg.create_dsm(file_name='RCG', function_order=function_order, include_system_vars=True, destination_folder=pdf_dir, keep_tex_file=True, compile_pdf=False)
->>>>>>> issue_fixes
+               keep_tex_file=True, compile_pdf=False)
 # Create a VISTOMS visualization of the RCG
 rcg.vistoms_create(vistoms_dir, function_order=function_order, compress=False)