Merge branch 'master' into move_doNd_to_core

Akshita07 · Mar 11, 2020 · 76455bc · 76455bc
2 parents 9ab13db + a569dc8
commit 76455bc
Show file tree

Hide file tree

Showing 3 changed files with 5,146 additions and 426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -105,9 +105,3 @@ benchmarking/results/
 qcodes/tests/dataset/fixtures/db_files/*
 qcodes/tests/output
 qcodes/tests/*.db
-qdev_wrappers
-export_functions.py
-Config.yaml
-QDAC - trials.py
-doNd.py
-QDAC-driver.code-workspace
diff --git a/docs/examples/driver_examples/Qcodes example with ZI UHF-LI.ipynb b/docs/examples/driver_examples/Qcodes example with ZI UHF-LI.ipynb