course json fix

DegreeDoctor · Apr 27, 2023 · 1b950f8 · 1b950f8
1 parent 7dca210
commit 1b950f8
Showing 1 changed file with 0 additions and 87 deletions.
diff --git a/frontend/src/data/minors.json b/frontend/src/data/minors.json
@@ -56,32 +56,6 @@
         {
           "amount": 2,
           "courses": [
-<<<<<<< Updated upstream
-            "Stars, Galaxies, and the Cosmos",
-            "Macroscopic Physical Chemistry",
-            "Modern Techniques in Chemistry",
-            "Molecular Biology",
-            "Instrumental Methods of Analysis",
-            "Isotope Geochemistry",
-            "Earth Materials",
-            "Organic Geochemistry",
-            "Earth and Sky",
-            "Molecular Biochemistry II",
-            "Mass Spectrometry",
-            "Chemistry of the Environment",
-            "Genetics and Evolution",
-            "Molecular Biology Laboratory",
-            "Introduction to Astrobiology",
-            "Physical Chemistry for Life Sciences",
-            "Introductory Astronomy and Astrophysics",
-            "Organic Chemistry I",
-            "Introduction to Geobiology",
-            "Aqueous Geochemistry",
-            "Molecular Biochemistry I",
-            "Evolution",
-            "Introduction to Geochemistry",
-            "Introduction to Cell and Molecular Biology"
-=======
             "Aqueous Geochemistry",
             "Molecular Biochemistry I",
             "Organic Geochemistry",
@@ -106,7 +80,6 @@
             "Organic Chemistry I",
             "Molecular Biochemistry II",
             "Instrumental Methods of Analysis"
->>>>>>> Stashed changes
           ]
         }
       ]
@@ -170,21 +143,12 @@
         {
           "amount": 3,
           "courses": [
-<<<<<<< Updated upstream
-            "Introduction to Cognitive Neuroscience",
-            "Hormones, Brain, and Behavior",
-            "Stress and the Brain",
-            "Behavioral Neuroscience",
-            "Cognition and the Brain",
-            "Drugs, Society, and Behavior"
-=======
             "Cognition and the Brain",
             "Introduction to Cognitive Neuroscience",
             "Hormones, Brain, and Behavior",
             "Stress and the Brain",
             "Drugs, Society, and Behavior",
             "Behavioral Neuroscience"
->>>>>>> Stashed changes
           ]
         }
       ]
@@ -912,19 +876,11 @@
         {
           "amount": 4,
           "courses": [
-<<<<<<< Updated upstream
-            "The Linguistics of Computational Linguistics",
-            "Advanced Topics in Linguistics",
-            "Language-Endowed Intelligent Agents",
-            "Introduction to Linguistics",
-            "Animal Cognition and Interaction with Humans",
-=======
             "Advanced Topics in Linguistics",
             "Animal Cognition and Interaction with Humans",
             "Language-Endowed Intelligent Agents",
             "The Linguistics of Computational Linguistics",
             "Introduction to Linguistics",
->>>>>>> Stashed changes
             "Cross-linguistic Perspectives"
           ]
         }
@@ -1027,19 +983,6 @@
         {
           "amount": 0,
           "courses": [
-<<<<<<< Updated upstream
-            "Topics in Deep Listening",
-            "Interdisciplinary Research Seminar",
-            "Music, Sound, & the Environment",
-            "Popular Music and Society",
-            "Topics in the History and Analysis of Music",
-            "Game Sound and Musical Play",
-            "Deep Listening",
-            "Histories of Jazz and Improvised Music",
-            "The Multimedia Century",
-            "World Music",
-            "Histories of Western Music"
-=======
             "World Music",
             "The Multimedia Century",
             "Topics in Deep Listening",
@@ -1051,7 +994,6 @@
             "Interdisciplinary Research Seminar",
             "Music, Sound, & the Environment",
             "Popular Music and Society"
->>>>>>> Stashed changes
           ]
         },
         {
@@ -1171,20 +1113,6 @@
         {
           "amount": 1,
           "courses": [
-<<<<<<< Updated upstream
-            "Drugs in History",
-            "Food, Farms, and Famine",
-            "Hormones, Brain, and Behavior",
-            "Health Economics and Policy",
-            "Gender, Science, and Technology",
-            "Behavioral Neuroscience",
-            "History of Mental Health",
-            "Bioethics",
-            "Medicine, Culture, and Society",
-            "Environmental Justice",
-            "History of Medicine",
-            "Drugs, Society, and Behavior"
-=======
             "History of Medicine",
             "Behavioral Neuroscience",
             "Gender, Science, and Technology",
@@ -1197,7 +1125,6 @@
             "Food, Farms, and Famine",
             "Environmental Justice",
             "Medicine, Culture, and Society"
->>>>>>> Stashed changes
           ]
         }
       ]
@@ -1353,19 +1280,6 @@
         {
           "amount": 3,
           "courses": [
-<<<<<<< Updated upstream
-            "Positive Psychology",
-            "Introduction to Psychological Science",
-            "Creative Nonfiction Writing",
-            "Hormones, Brain, and Behavior",
-            "Stress and the Brain",
-            "Rensselaer Concert Choir",
-            "Sensibilities",
-            "Ethics",
-            "Creative Writing:  Short Story",
-            "Psychology of Mindfulness",
-            "Drugs, Society, and Behavior"
-=======
             "Ethics",
             "Introduction to Psychological Science",
             "Creative Writing:  Short Story",
@@ -1377,7 +1291,6 @@
             "Positive Psychology",
             "Stress and the Brain",
             "Psychology of Mindfulness"
->>>>>>> Stashed changes
           ]
         }
       ]