ian pushed before i could

Merge branch 'master' of https://github.com/Laurenhut/ME495-final-project
Laurenhut · Dec 9, 2017 · b7500ae · b7500ae
2 parents bce8ecf + 26933bf
commit b7500ae
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 200 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,6 @@ add_message_files(
 
  add_service_files(
    FILES
-   Open.srv
    Open2.srv
  )
 

diff --git a/media/Screenshot from 2017-12-08 14-49-17.png b/media/Screenshot from 2017-12-08 14-49-17.png
diff --git a/media/Screenshot from 2017-12-08 14-49-33.png b/media/Screenshot from 2017-12-08 14-49-33.png
diff --git a/media/Screenshot from 2017-12-08 14-49-56.png b/media/Screenshot from 2017-12-08 14-49-56.png
diff --git a/media/TheSun2.png b/media/TheSun2.png
diff --git a/media/researchsdk.png b/media/researchsdk.png
diff --git a/src/press_service.py b/src/press_service.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ add_message_files( @@
      add_service_files(
        FILES
-       Open.srv
        Open2.srv
      )
@@ Expand Down @@