Resolve merge conflicts master into devicesettings · 399c72e61d - libicsneo - ICSG Git

mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00

Resolve merge conflicts master into devicesettings

This commit is contained in:

Paul Hollinsky

2018-09-26 18:24:59 -04:00

parent a5b79167b9 4c45b235bc

commit 399c72e61d

40 changed files with 142 additions and 123 deletions

									
										platform/posix/include/ftdi.h
									
		+1
		-1
	
												View File
												
				@@ -46,6 +46,6 @@ private:

					FTDIDevice ftdiDevice;

				};

				};

				}

				#endif

									
										platform/posix/include/stm32.h
									
		+1
		-1
	
												View File
												
				@@ -26,6 +26,6 @@ private:

					void writeTask();

				};

				};

				}

				#endif