fix conflict
[sgn.git] / bin / 
tree234218d7ec033d8d880fe24a9a4fdc4f840b3260
drwxr-xr-x   ..
drwxr-xr-x - ODK
-rwxr-xr-x 4086 bdb_update_blast_dbs.pl
-rw-r--r-- 1866 change_name_of_obsolete_stocks_matching_pattern.pl
-rwxr-xr-x 2970 change_trait_ids.pl
-rw-r--r-- 1268 combine_dosage_files.pl
-rw-r--r-- 1456 delete_images.pl
-rw-r--r-- 3289 delete_stocks.pl
-rw-r--r-- 2958 delete_trials.pl
-rw-r--r-- 4346 detect_duplicate_field_design_stock_properties.pl
-rw-r--r-- 8465 dump_markers_to_fasta.pl
-rw-r--r-- 7520 find_and_load_longitude_latitude.pl
-rwxr-xr-x 2809 iotw.pl
drwxr-xr-x - jbrowse_vcf_tools
-rwxr-xr-x 3967 load_composed_cvprops.pl
-rw-r--r-- 1060 load_field_coords.pl
-rwxr-xr-x 27003 load_fish_images_and_data.pl
-rwxr-xr-x 7984 load_fish_stuff.pl
-rw-r--r-- 14306 load_genotypes.pl
-rw-r--r-- 10172 load_genotypes_vcf_cxgn_postgres.pl
-rw-r--r-- 2518 load_locations.pl
-rw-r--r-- 3822 load_locations_extended.pl
-rw-r--r-- 1380 load_locus_publications.pl
-rwxr-xr-x 12120 load_map_data.pl
-rw-r--r-- 15360 load_marker_data.pl
-rw-r--r-- 1873 load_marker_locus_associations.pl
-rw-r--r-- 5879 load_phenotypes_fieldbook.pl
-rw-r--r-- 6500 load_phenotypes_spreadsheet_csv.pl
-rw-r--r-- 1974 load_pub_doi.pl
-rw-r--r-- 3139 load_qtl_loci.pl
-rw-r--r-- 4109 load_snps.pl
-rwxr-xr-x 14417 load_stock_banana.pl
-rw-r--r-- 1883 load_trait_formula.pl
-rwxr-xr-x 4237 load_trait_props.pl
drwxr-xr-x - loading_scripts
-rw-r--r-- 2251 merge_stocks.pl
-rwxr-xr-x 6092 old_load_markers.pl
-rwxr-xr-x 555 purge_old_iotw.pl
-rw-r--r-- 2849 refresh_matviews.pl
-rwxr-xr-x 4549 remove_genotypes.pl
-rw-r--r-- 1624 remove_parents.pl
-rwxr-xr-x 3882 remove_whitespace_from_names.pl
-rw-r--r-- 2375 rename_cvterms.pl
-rw-r--r-- 1845 replace_string_in_stock_name.pl
-rwxr-xr-x 86 sgn.psgi
-rwxr-xr-x 434 sgn_cgi.pl
-rwxr-xr-x 1454 sgn_create.pl
-rwxr-xr-x 1160 sgn_fastcgi.pl
-rwxr-xr-x 1850 sgn_server.pl
-rwxr-xr-x 650 sgn_test.pl
-rwxr-xr-x 20 sgn_wrapper
drwxr-xr-x - test
-rw-r--r-- 3230 update_cvterm_annotations.pl
-rw-r--r-- 5162 update_marker_synonyms.pl
-rw-r--r-- 1102 update_trial_locations.pl