Merge conflict resolved

2018-10-13 12:35:21 +01:00
parent f1ebfb3cef d98ee140ed
commit 0e700cc56f
7 changed files with 642 additions and 15 deletions
--- a/Resolver/universal-science-solver/Physics/BasicPhysics.cs
+++ b/Resolver/universal-science-solver/Physics/BasicPhysics.cs
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace universal_science_solver.Physics {
-    class BasicPhysics {
-        public static void SpeedDistanceTime() {
-            Console.WriteLine("Calculate distance (d), speed (s) or time (t)");
-
-            
-        }
-    }
-}