Merge /home/zas1024/gene

Conflicts:
	wqflask/wqflask/static/new/javascript/dataset_select_menu.js
	wqflask/wqflask/templates/corr_scatter_plot_old.html

1 files changed, 1 insertions, 1 deletions

diff --git a/web/genotypes/CTB6F2.geno b/web/genotypes/CTB6F2.geno
index 7afb8610..bf82c962 100755
--- a/web/genotypes/CTB6F2.geno
+++ b/web/genotypes/CTB6F2.geno
@@ -6,7 +6,7 @@
 #heterozygous, optional, default is H

 @het:H

 #Unknown , optional, default is U

-@unk:XX

+@unk:U

 #Strains are all F2s, listed as CTB6F2Number instead of CTB6F2Number because QTL reaper considers F2s differently, since most sets are inbred. On Chr M, those with a B allele are BxCast, those with a A allele are CastxB

 Chr	Locus	cM	Mb	CTB6F2001	CTB6F2002	CTB6F2003	CTB6F2004	CTB6F2005	CTB6F2006	CTB6F2007	CTB6F2008	CTB6F2009	CTB6F2010	CTB6F2011	CTB6F2013	CTB6F2015	CTB6F2016	CTB6F2017	CTB6F2018	CTB6F2019	CTB6F2020	CTB6F2021	CTB6F2022	CTB6F2023	CTB6F2024	CTB6F2025	CTB6F2026	CTB6F2027	CTB6F2028	CTB6F2029	CTB6F2033	CTB6F2034	CTB6F2035	CTB6F2036	CTB6F2039	CTB6F2040	CTB6F2041	CTB6F2042	CTB6F2043	CTB6F2045	CTB6F2046	CTB6F2047	CTB6F2048	CTB6F2049	CTB6F2053	CTB6F2054	CTB6F2055	CTB6F2057	CTB6F2058	CTB6F2059	CTB6F2060	CTB6F2061	CTB6F2062	CTB6F2063	CTB6F2064	CTB6F2065	CTB6F2066	CTB6F2067	CTB6F2068	CTB6F2069	CTB6F2070	CTB6F2071	CTB6F2072	CTB6F2073	CTB6F2074	CTB6F2075	CTB6F2076	CTB6F2077	CTB6F2078	CTB6F2079	CTB6F2080	CTB6F2081	CTB6F2083	CTB6F2085	CTB6F2088	CTB6F2089	CTB6F2090	CTB6F2091	CTB6F2093	CTB6F2094	CTB6F2095	CTB6F2097	CTB6F2098	CTB6F2099	CTB6F2101	CTB6F2104	CTB6F2108	CTB6F2109	CTB6F2111	CTB6F2112	CTB6F2113	CTB6F2114	CTB6F2115	CTB6F2116	CTB6F2117	CTB6F2118	CTB6F2119	CTB6F2120	CTB6F2122	CTB6F2123	CTB6F2126	CTB6F2127	CTB6F2128	CTB6F2129	CTB6F2130	CTB6F2132	CTB6F2133	CTB6F2134	CTB6F2135	CTB6F2137	CTB6F2138	CTB6F2139	CTB6F2140	CTB6F2141	CTB6F2142	CTB6F2144	CTB6F2145	CTB6F2146	CTB6F2147	CTB6F2148	CTB6F2150	CTB6F2151	CTB6F2152	CTB6F2154	CTB6F2155	CTB6F2157	CTB6F2159	CTB6F2160	CTB6F2161	CTB6F2162	CTB6F2163	CTB6F2164	CTB6F2165	CTB6F2167	CTB6F2168	CTB6F2169	CTB6F2170	CTB6F2171	CTB6F2173	CTB6F2174	CTB6F2175	CTB6F2178	CTB6F2179	CTB6F2180	CTB6F2181	CTB6F2182	CTB6F2183	CTB6F2184	CTB6F2185	CTB6F2186	CTB6F2187	CTB6F2188	CTB6F2189	CTB6F2190	CTB6F2191	CTB6F2193	CTB6F2194	CTB6F2196	CTB6F2197	CTB6F2198	CTB6F2199	CTB6F2200	CTB6F2201	CTB6F2202	CTB6F2203	CTB6F2204	CTB6F2205	CTB6F2207	CTB6F2208	CTB6F2210	CTB6F2211	CTB6F2212	CTB6F2213	CTB6F2214	CTB6F2215	CTB6F2216	CTB6F2217	CTB6F2218	CTB6F2220	CTB6F2222	CTB6F2223	CTB6F2224	CTB6F2225	CTB6F2227	CTB6F2228	CTB6F2229	CTB6F2230	CTB6F2231	CTB6F2232	CTB6F2234	CTB6F2235	CTB6F2236	CTB6F2237	CTB6F2238	CTB6F2239	CTB6F2240	CTB6F2241	CTB6F2243	CTB6F2245	CTB6F2246	CTB6F2247	CTB6F2250	CTB6F2252	CTB6F2253	CTB6F2256	CTB6F2257	CTB6F2258	CTB6F2259	CTB6F2260	CTB6F2261	CTB6F2262	CTB6F2263	CTB6F2264	CTB6F2265	CTB6F2266	CTB6F2267	CTB6F2268	CTB6F2269	CTB6F2270	CTB6F2271	CTB6F2272	CTB6F2273	CTB6F2274	CTB6F2275	CTB6F2276	CTB6F2277	CTB6F2278	CTB6F2279	CTB6F2280	CTB6F2281	CTB6F2282	CTB6F2283	CTB6F2284	CTB6F2285	CTB6F2286	CTB6F2287	CTB6F2288	CTB6F2289	CTB6F2290	CTB6F2291	CTB6F2292	CTB6F2293	CTB6F2294	CTB6F2296	CTB6F2297	CTB6F2298	CTB6F2299	CTB6F2300	CTB6F2301	CTB6F2302	CTB6F2303	CTB6F2304	CTB6F2305	CTB6F2306	CTB6F2307	CTB6F2308	CTB6F2309	CTB6F2311	CTB6F2312	CTB6F2313	CTB6F2314	CTB6F2315	CTB6F2316	CTB6F2317	CTB6F2318	CTB6F2319	CTB6F2320	CTB6F2321	CTB6F2323	CTB6F2324	CTB6F2326	CTB6F2327	CTB6F2328	CTB6F2329	CTB6F2330	CTB6F2331	CTB6F2332	CTB6F2333	CTB6F2334	CTB6F2335	CTB6F2336	CTB6F2337	CTB6F2338	CTB6F2343	CTB6F2345	CTB6F2346	CTB6F2347	CTB6F2349	CTB6F2353	CTB6F2354	CTB6F2355	CTB6F2359	CTB6F2360	CTB6F2361	CTB6F2362	CTB6F2363	CTB6F2364	CTB6F2366	CTB6F2368	CTB6F2370	CTB6F2371	CTB6F2372	CTB6F2373	CTB6F2375	CTB6F2378	CTB6F2380	CTB6F2381	CTB6F2382	CTB6F2383	CTB6F2384	CTB6F2385	CTB6F2386	CTB6F2387	CTB6F2388	CTB6F2389	CTB6F2390	CTB6F2391	CTB6F2392	CTB6F2394	CTB6F2395	CTB6F2396	CTB6F2397	CTB6F2398	CTB6F2399	CTB6F2400	CTB6F2401	CTB6F2402	CTB6F2403	CTB6F2404	CTB6F2405	CTB6F2406	CTB6F2407	CTB6F2408	CTB6F2410	CTB6F2411	CTB6F2412	CTB6F2413	CTB6F2414	CTB6F2415	CTB6F2416	CTB6F2417	CTB6F2418	CTB6F2419	CTB6F2420	CTB6F2421	CTB6F2422	CTB6F2423	CTB6F2424	CTB6F2425	CTB6F2426	CTB6F2427	CTB6F2428	CTB6F2429	CTB6F2430	CTB6F2431	CTB6F2432	CTB6F2433	CTB6F2434	CTB6F2435	CTB6F2436	CTB6F2437	CTB6F2438	CTB6F2439	CTB6F2440	CTB6F2441	CTB6F2442	CTB6F2443	CTB6F2444	CTB6F2445	CTB6F2446	CTB6F2448	CTB6F2449	CTB6F2450	CTB6F2452	CTB6F2453	CTB6F2454	CTB6F2455	CTB6F2456	CTB6F2457	CTB6F2458	CTB6F2460	CTB6F2461	CTB6F2462	CTB6F2463	CTB6F2464	CTB6F2465	CTB6F2466	CTB6F2468	CTB6F2469	CTB6F2470	CTB6F2471	CTB6F2472	CTB6F2473	CTB6F2474	CTB6F2475	CTB6F2476	CTB6F2477	CTB6F2498	CTB6F2499	CTB6F2500	CTB6F2502	CTB6F2504	CTB6F2506	CTB6F2507	CTB6F2508	CTB6F2509	CTB6F2510	CTB6F2511	CTB6F2512	CTB6F2514	CTB6F2516	CTB6F2518	CTB6F2520	CTB6F2521	CTB6F2522	CTB6F2523	CTB6F2524	CTB6F2525	CTB6F2526	CTB6F2527	CTB6F2528	CTB6F2529	CTB6F2532	CTB6F2533	CTB6F2536	CTB6F2537	CTB6F2538	CTB6F2539	CTB6F2540	CTB6F2541	CTB6F2542	CTB6F2543	CTB6F2544	CTB6F2545	CTB6F2546	CTB6F2547	CTB6F2548	CTB6F2549	CTB6F2550	CTB6F2551	CTB6F2552

 1	rs3683945	0	3.18748	H	A	A	H	H	H	B	H	A	H	H	A	A	H	B	A	H	H	H	A	H	A	H	H	H	H	H	H	A	H	A	A	H	A	H	B	A	A	H	H	B	H	H	H	H	A	H	A	H	A	A	H	H	H	H	A	A	H	B	B	H	A	H	H	H	H	H	H	A	H	B	H	A	H	H	A	H	A	H	A	A	A	H	H	H	A	A	H	H	H	A	A	H	A	A	A	H	H	H	H	B	H	H	H	H	H	H	H	H	H	A	A	B	H	H	H	A	B	H	A	H	A	B	H	H	A	H	H	A	A	H	A	H	H	A	H	A	A	B	A	H	A	B	B	H	H	A	H	H	H	H	H	A	A	H	H	H	B	A	H	H	H	H	H	B	A	H	H	B	H	H	H	H	H	A	H	H	B	H	A	B	B	H	H	A	A	A	H	H	H	A	A	H	H	H	H	A	H	H	A	H	H	H	H	B	B	B	B	H	H	B	H	A	H	H	H	H	H	A	B	H	H	B	B	H	B	H	H	A	A	B	H	A	B	H	H	A	A	H	B	H	H	H	H	B	A	H	B	A	H	B	B	A	H	H	H	H	B	B	A	H	A	H	A	H	H	A	H	H	H	H	A	B	H	A	H	H	H	H	A	H	H	A	A	B	H	H	H	H	H	A	B	H	H	A	B	H	H	A	H	A	H	H	A	H	H	H	B	B	B	H	A	A	H	B	H	A	B	H	A	B	H	A	A	A	H	A	H	H	A	H	B	B	H	B	H	H	H	A	H	H	H	H	B	H	H	B	A	B	A	A	B	H	H	H	B	A	H	H	H	H	H	B	B	H	H	B	H	B	A	A	H	H	H	A	B	H	A	B	B	A	B	H	A	B	H	B	A	H	H	B	H	A	H	H	B	H	B	B	H	B	B	H	H	A	H	A	H	H	A	H	H	A	H	H	B	B	H	H	B	H	H	B	H	A	B	B	A	A	H	B	H	A	H	H	H	H	H