Generate CRDs

Signed-off-by: Philip Laine <philip.laine@xenit.se>

config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml

@@ -88,12 +88,8 @@ spec:
                     type: string
                 type: object
               timeout:
-<<<<<<< HEAD
-                description: The timeout for download operations, defaults to 20s.
-=======
                 default: 20s
-                description: The timeout for download operations, default ('20s').
+                description: The timeout for download operations, defaults to 20s.
->>>>>>> 0948720 (Fix duration default values)
                 type: string
             required:
             - bucketName

config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml

@@ -63,12 +63,8 @@ spec:
                   defaults to master branch.
                 properties:
                   branch:
-<<<<<<< HEAD
-                    description: The Git branch to checkout, defaults to master.
-=======
                     default: master
-                    description: The git branch to checkout, defaults to master.
+                    description: The Git branch to checkout, defaults to master.
->>>>>>> 0948720 (Fix duration default values)
                     type: string
                   commit:
                     description: The Git commit SHA to checkout, if specified Tag
@@ -94,12 +90,8 @@ spec:
                     type: string
                 type: object
               timeout:
-<<<<<<< HEAD
-                description: The timeout for remote Git operations like cloning, defaults
-=======
                 default: 20s
-                description: The timeout for remote git operations like cloning, default
+                description: The timeout for remote Git operations like cloning, defaults
->>>>>>> 0948720 (Fix duration default values)
                   to 20s.
                 type: string
               url: