From 6836a1ac5a1d808f411e69647a53f5dedce2a680 Mon Sep 17 00:00:00 2001 From: Timothy Loftus Date: Sun, 6 Oct 2024 20:50:00 -0500 Subject: [PATCH] trying to fix commit --- snc/subnetCmd.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/snc/subnetCmd.go b/snc/subnetCmd.go index 6fce869..9d4bb6c 100644 --- a/snc/subnetCmd.go +++ b/snc/subnetCmd.go @@ -4,21 +4,12 @@ import ( "github.com/spf13/cobra" ) -<<<<<<< HEAD -var subnetCmd = &cobra.Command { - Use: "subnet [subnet/CIDR]", - Short: "NOT COMPLETE: Calculate and display subnet and subnet ranges", - Long: "Calculate and display subnet and subnet ranges.", - Run: func(cmd *cobra.Command, args []string) { - }, -======= var subnetCmd = &cobra.Command{ Use: "subnet [subnet/CIDR]", - Short: "Calculate and display subnet and subnet ranges", + Short: "NOT COMPLETE: Calculate and display subnet and subnet ranges", Long: "Calculate and display subnet and subnet ranges.", Run: func(cmd *cobra.Command, args []string) { }, ->>>>>>> 8a102b8 (Updating subnet calculator feature) } func init() {