Skip to content

Commit

Permalink
try this
Browse files Browse the repository at this point in the history
  • Loading branch information
Tezeroth committed Dec 10, 2024
1 parent cfd0023 commit 18b89ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MIT License

=======
Copyright (c) 2024 Tezzeroth
>>>>>>> origin/main

Copyright (c) 2024


Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<<<<<<< HEAD
xr-starter-kit
=============


A boiler plate project for getting started with VR and AR with AFrame

Expand Down

0 comments on commit 18b89ea

Please sign in to comment.