fix 🔨

posts/2024/2024-12-01-posts.md

@@ -50,7 +50,11 @@ There are a couple other things I’ve found convenient. For virtual meetings, I
 
 <div>&nbsp;</div>
 
+<<<<<<< HEAD
 So yes, you can definitely sub in your iPad for development, sysadmin, and other things. It’s more comfortable in the air, on the road, or on the couch. I read somewhere that Apple is working on a new monitor/tablet of sorts that’s tailored towards home automation. I’m in, take my money. I'm a shareholder.
+=======
+So yes, you can definitely sub in your iPad for development, sysadmin, and other things. It’s more comfortable in the air, on the road, or on the couch. I read somewhere that Apple is working on a new monitor/tablet of sorts that’s tailored towards home automation. I’m in, take my money, I'm a shareholder.
+>>>>>>> d2de4b0deaa1c841e1dd4ce7d36903abe3835049
 
 <div>&nbsp;</div>