Removing trailing line

dglaude · dglaude · commit 1aac0cc02a1f · 2020-03-15T00:36:59.000+01:00
diff --git a/adafruit_is31fl3731.py b/adafruit_is31fl3731.py
@@ -812,4 +812,4 @@ def pixel_addr(x, y):
             x = x - 8
             y = y - 8
         return x * 16 + y
->>>>>>> 8fd100b54f89f6d8d2c6a5a23438f427e01afb6c
+
