Fixing merge

Author: thk123

src/goto-instrument/goto_instrument_parse_options.h

@@ -59,6 +59,7 @@ Author: Daniel Kroening, [email protected]
   "(show-uninitialized)(show-locations)" \
   "(full-slice)(reachability-slice)(slice-global-inits)" \
   "(remove-unreachable-functions)" \
+  "(inline)(partial-inline)(function-inline):(log):(no-caching)" \
   OPT_REMOVE_CONST_FUNCTION_POINTERS \
   "(remove-function-pointers)" \
   "(show-claims)(show-properties)(property):" \