add a comment

playground-common/src/Gist.hs

@@ -28,11 +28,15 @@ module Gist
 
 import           Auth.Types        (Token, TokenProvider (Github))
 import           Data.Aeson        (FromJSON, GFromJSON, ToJSON, Value, Zero, genericParseJSON, object, parseJSON,
+<<<<<<< HEAD
 <<<<<<< HEAD
                                     toJSON, withObject, (.!=), (.:), (.:?), (.=))
 =======
                                     toJSON, withObject, (.:), (.:?), (.=), (.!=))
 >>>>>>> Save entire workspace when saving to gist
+=======
+                                    toJSON, withObject, (.!=), (.:), (.:?), (.=))
+>>>>>>> add a comment
 import           Data.Aeson.Casing (aesonPrefix, snakeCase)
 import           Data.Aeson.Types  (Parser)
 import           Data.Bifunctor    (bimap)
@@ -149,10 +153,7 @@ instance FromJSON Gist where
             _gistTruncated <- o .: "truncated"
             _gistCreatedAt <- o .: "created_at"
             _gistUpdatedAt <- o .: "updated_at"
-<<<<<<< HEAD
             -- playground gists will always have a description but to avoid breaking with non-playground gists we change null to empty string
-=======
->>>>>>> Save entire workspace when saving to gist
             _gistDescription <- o .:? "description" .!= ""
             pure Gist {..}