1.0

README.md

@@ -11,3 +11,18 @@ http:https://www.acdc.foxylab.com
 
 GeigerCounter_MATLAB распространяется под лицензией GPL v3.0.
 
+<<<<<<< HEAD
+=======
+----------------------------------------------------------------------------------------------------------------------
+
+GeigerCounter_MATLAB - implementation in MATLAB programming language of the registration procedure of radiation particles entering the dosimeter counter. Dosimeter (for example, http:https://acdc.foxylab.com/node/32 (in russian) or similar) must be connected to the corresponding audio jack of the computer (the line or microphone input) and give pulse to the particles in contact with a Geiger counter. Detailed description (in russian) - http:https://acdc.foxylab.com/node/42.
+
+The project is designed to use a 32-bit version of MATLAB.
+
+Author - Alexey V. Voronin @ FoxyLab © 2015
+
+http:https://www.acdc.foxylab.com
+
+GeigerCounter_MATLAB licensed under the GPL v3.0.
+
+>>>>>>> b86ba9295e29678eb7c4d1a3c2c453c83ba42a85