|
|
@@ -1,4 +1,9 @@
|
|
|
+<<<<<<< HEAD
|
|
|
+OpenEphys_SampleData_1 is provided by josh.siegle@gmail.com from open ephys project.
|
|
|
+OpenEphys_SampleData_2 is provided by Cristian Tatarau
|
|
|
+=======
|
|
|
OpenEphys_SampleData_1 is provodide by josh.siegle@gmail.com from open ephys project.
|
|
|
OpenEphys_SampleData_2_(multiple_starts) is provodide by josh.siegle@gmail.com from open ephys project.
|
|
|
OpenEphys_SampleData_3 is provide by Cristian Tatarau. Have multi semgent and have a smaller continuous file (CH32)
|
|
|
|
|
|
+>>>>>>> refs/remotes/origin/master
|
