remove rebase comments

FortAwesome · Jul 10, 2023 · 358a75e · 358a75e
1 parent 71984e6
commit 358a75e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/components/__tests__/FontAwesomeIcon.test.js b/src/components/__tests__/FontAwesomeIcon.test.js
@@ -128,11 +128,7 @@ describe("unrelated Vue data options", () => {
     const wrapper = compileAndMount({
       template: '<font-awesome-icon class="extra" :icon="icon" />',
       data() {
-<<<<<<< HEAD
         return { icon: faCoffee }
-=======
-        return { icon: faCoffee };
->>>>>>> 444dbfa (add tests for family (#458))
       },
       components: {
         FontAwesomeIcon,