Update README.md

jonvirak · web-flow · commit bcc937a859a7 · 2025-03-20T13:10:58.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Introduction to Software Engineering
 
 Software Engineering is more of an encompassing approach to the development of software.  For us to understand what we will be doing in this course we need to define Software Design and Development as two independent ideas to creating software.  Thus the terms *software design*, *software development*, and *software engineering* will be defined for clarity.  For the most part we use *software design*, *software development* and *software engineering* as interchangeable words.  They, however, are scaffolded ideas and we will breakdown each one.  From there you will understand the purpose and goal of the course.  Below are the differences:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`# Introduction to Software Engineering`
`3`	`2`
`4`	`3`	Software Engineering is more of an encompassing approach to the development of software. For us to understand what we will be doing in this course we need to define Software Design and Development as two independent ideas to creating software. Thus the terms software design, software development, and software engineering will be defined for clarity. For the most part we use software design, software development and software engineering as interchangeable words. They, however, are scaffolded ideas and we will breakdown each one. From there you will understand the purpose and goal of the course. Below are the differences: