Merge branch 'master' into tra-service

This commit is contained in:
Arthur Lu 2020-08-10 16:11:38 -05:00 committed by GitHub
commit 434b85cb5a

View File

@ -1,5 +1,5 @@
# Titan Robotics Team 2022: Superscript Script # Titan Robotics Team 2022: Superscript Script
# Written by Arthur Lu & Jacob Levine # Written by Arthur Lu, Jacob Levine, and Dev Singh
# Notes: # Notes:
# setup: # setup:
@ -110,7 +110,7 @@ __all__ = [
# imports: # imports:
from analysis import analysis as an from tra_analysis import analysis as an
import data as d import data as d
import json import json
import numpy as np import numpy as np