resolved merge conflict

chusloj · chusloj · commit df4e48a0c2b3 · 2020-08-10T10:44:14.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@ cps_data/pycps/cps_raw.csv.gz
 cpsmar*.sas
 cpsmar*.csv
 *.dat
+
+# pickle
+cps*.pkl
