resolve merge conflict after rebase

Signed-off-by: Sven Thoms <[email protected]>

docs/source/user_guide/pipeline-components.md

@@ -24,13 +24,7 @@ limitations under the License.
 
 ![A basic Kubeflow pipeline](../images/user_guide/pipeline-components/kubeflow-pipeline.png)
 
-The same pipeline could be implemented using a single component that performs all these tasks, but that component might not be as universally re-usable. Consider, for example, that for another project the data resides in a different kind of storage. With fine-granular components you'd only have to replace the load data component with one that supports the other storage type and could retain everything else. 
-
-#### Generic components
-
-Viewed
-Original file line number 	Diff line number 	Diff line change
-@@ -28,15 +28,15 @@ The same pipeline could be implemented using a single component that performs al
+The same pipeline could be implemented using a single component that performs all these tasks, but that component might not be as universally re-usable. Consider, for example, that for another project the data resides in a different kind of storage. With fine-granular components you'd only have to replace the load data component with one that supports the other storage type and could retain everything else.
 
 #### Generic components