Fixed merge remnant in Berksfile.lock.

mboersma · mboersma · commit 1b7033c2362b · 2014-02-12T16:37:32.000-07:00
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -58,7 +58,6 @@
     },
     "sysctl": {
       "locked_version": "0.3.5"
->>>>>>> switch to containerized cookbooks branch
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@`
`58`	`58`	`},`
`59`	`59`	`"sysctl": {`
`60`	`60`	`"locked_version": "0.3.5"`
`61`		`->>>>>>> switch to containerized cookbooks branch`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`	`}`