diff --git a/.DS_Store b/.DS_Store index 3bd3ae3..4ca2c5a 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/pages/adaptivesoundscap.vue b/pages/adaptivesoundscap.vue index aec1023..0ad81c8 100755 --- a/pages/adaptivesoundscap.vue +++ b/pages/adaptivesoundscap.vue @@ -22,8 +22,8 @@
-

The Mindboost sounscape responds to the

-

acousitcs in your room.

+

The Mindboost sounscape responds to the acousitcs in your room.

+

Currently, your room has a:

diff --git a/pages/homeforest.vue b/pages/homeforest.vue index b6673c7..d63247a 100644 --- a/pages/homeforest.vue +++ b/pages/homeforest.vue @@ -3,7 +3,7 @@
- +
- +
- +
- + Make sure that your headphones are properly connected.
To use Mindboost, headphones are required.
+<<<<<<< HEAD:pages/onboarding/index.vue
+======= +
+
+ +>>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/index.vue -
+ diff --git a/pages/onboarding/onboarding2.vue b/pages/onboarding/onboarding2.vue index 563f03f..24d5d9f 100644 --- a/pages/onboarding/onboarding2.vue +++ b/pages/onboarding/onboarding2.vue @@ -9,8 +9,13 @@
What’s that?
+<<<<<<< HEAD:pages/onboarding/onboarding2.vue
+======= +
+ +>>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording2.vue -
+ diff --git a/pages/onboarding/onboarding3.vue b/pages/onboarding/onboarding3.vue index 88d6281..3159b99 100644 --- a/pages/onboarding/onboarding3.vue +++ b/pages/onboarding/onboarding3.vue @@ -8,8 +8,13 @@

What are your plans for today?

+<<<<<<< HEAD:pages/onboarding/onboarding3.vue
+======= +
+ +>>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording3.vue -
+ diff --git a/pages/onboarding/onboarding4.vue b/pages/onboarding/onboarding4.vue index 5c8110c..a523dce 100644 --- a/pages/onboarding/onboarding4.vue +++ b/pages/onboarding/onboarding4.vue @@ -8,8 +8,13 @@

Please choose a soundscape

+<<<<<<< HEAD:pages/onboarding/onboarding4.vue
+======= +
+ +>>>>>>> c2fd5cdf9222ad06828578796322b9ef8ac834d1:pages/onbording/onbording4.vue -
+ diff --git a/pages/setting.vue b/pages/setting.vue index 880c291..9902710 100755 --- a/pages/setting.vue +++ b/pages/setting.vue @@ -51,15 +51,13 @@ @@ -106,11 +104,11 @@
  • - Tropics + Tropics
  • -
  • Forest
  • -
  • Meadow +
  • Forest
  • +
  • Meadow
  • diff --git a/public/.DS_Store b/public/.DS_Store new file mode 100644 index 0000000..4c1eeb2 Binary files /dev/null and b/public/.DS_Store differ