Merge branch 'master' into tra-service

This commit is contained in:
Arthur Lu authored and GitHub committed 2020-08-10 16:11:38 -05:00
commit 3e335756e1
7 files changed
+58 -16

No files matched your search

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