From 1229771a68b05eb973c415fcd2cc27bfadf32418 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mess@yelp.com>
Date: Mon, 14 Nov 2022 10:18:19 -0500
Subject: [PATCH] Merge conflict

---
 darwin/homebrew.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index c569afd..050378d 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -66,6 +66,7 @@
     "stay"
     "transmission"
     "utm"
+    "wacom-tablet"
     # "zoom"
   ];