Skip to content

Commit

Permalink
Update TO_LAB with pull nasa#29
Browse files Browse the repository at this point in the history 
Manual merge was required to resolve conflict
  • Loading branch information
@jphickey
jphickey committed May 11, 2020
1 parent fb8f91e commit 5032e7c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/to_lab
Submodule to_lab updated 3 files
+16 −16 fsw/platform_inc/to_lab_sub_table.h
+16 −12 fsw/src/to_lab_app.c
+1 −1 fsw/src/to_lab_app.h

0 comments on commit 5032e7c

Please sign in to comment.