Skip to content

Commit 007753e

Browse files
Rebecca Murpheyajpiano
Rebecca Murphey
authored andcommitted
cleanup
1 parent 996f601 commit 007753e

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

content/javascript-101/objects.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,4 @@ key-value pair can be written as any valid JavaScript identifier, a string
4040
'some string' : 456,
4141
99999 : 789
4242
};
43-
<<<<<<< HEAD
44-
=======
45-
46-
Object literals can be extremely useful for code organization; for more
47-
information, read Using Objects to Organize Your Code by Rebecca Murphey.
48-
>>>>>>> objects md file
4943
</div>

0 commit comments

Comments
 (0)