Commit 813e24362ffdc23f19dfd8349a28c76be72bbefd
1 parent
fb33a352
Exists in
master
merge modified compute_sed? Does anybody know how this can occur?
Showing
1 changed file
with
0 additions
and
8 deletions
Show diff stats
src/idl/dustem_compute_sed.pro
| 1 | 1 | FUNCTION dustem_compute_sed,p_dim,$ |
| 2 | 2 | st=st,$ |
| 3 | -<<<<<<< HEAD | |
| 4 | 3 | SED_spec=SED_spec, $ |
| 5 | -======= | |
| 6 | - SED_spec=SED_spec,$ | |
| 7 | ->>>>>>> 3d0f6b674607769b0cbaf3703a82f722877e253d | |
| 8 | 4 | help=help |
| 9 | 5 | |
| 10 | 6 | ;+ |
| ... | ... | @@ -15,11 +11,7 @@ FUNCTION dustem_compute_sed,p_dim,$ |
| 15 | 11 | ; CATEGORY: |
| 16 | 12 | ; Dustem |
| 17 | 13 | ; CALLING SEQUENCE: |
| 18 | -<<<<<<< HEAD | |
| 19 | 14 | ; sed=dustem_compute_sed(p_dim[,st][,sed_spec][,/help]) |
| 20 | -======= | |
| 21 | -; sed=dustem_compute_sed(p_dim[,st=][,sed_spec][,/help]) | |
| 22 | ->>>>>>> 3d0f6b674607769b0cbaf3703a82f722877e253d | |
| 23 | 15 | ; INPUTS: |
| 24 | 16 | ; p_dim = parameter values |
| 25 | 17 | ; OPTIONAL INPUT PARAMETERS: | ... | ... |