diff --git a/.github/ISSUE_TEMPLATE/another-tech-lead.md b/.github/ISSUE_TEMPLATE/another-tech-lead.md new file mode 100644 index 0000000..99767bb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/another-tech-lead.md @@ -0,0 +1,24 @@ +--- +name: Another Tech Lead +about: Create a new issue +title: '' +labels: '' +assignees: '' + +--- + +Description +Create a merge conflict for me! + +Acceptance Criteria + + +Follow steps in Part 2 (clone my repo, create your branch) + +In the home page, contribute some code. + +Push your branch to develop. Hopefully this forces a merge conflict! +Note: You may have to clone an earlier version of this repository to force the merge conflict. See if you can do it! You may need to contact me :) + +Additional Information +Include a screenshot of your page diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md deleted file mode 100644 index 6dc29db..0000000 --- a/.github/ISSUE_TEMPLATE/new-issue.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: New Issue -about: Create a new issue -title: '' -labels: '' -assignees: '' - ---- - -**Description** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Acceptance Criteria** -A clear and concise description of what you want to happen. - -Steps: -- step 1 -- step 2 - -**Additional Information** -Add any other context or screenshots about the feature request here. diff --git a/src/app/page.tsx b/src/app/page.tsx index 2d87964..67061dd 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -6,22 +6,21 @@ export default function Home() {
- Ryan Agdassi is a computer science student at California Polytechnic State University - San Luis Obispo. + Kai is a computer science student at California Polytechnic State University - San Luis Obispo.