[BAEL-14274] - Fixed conflicts

linux-bash/loops/src/main/bash/find_directories.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+find . -maxdepth 1 -mindepth 1 -type d -printf '%f\n'
+
+find . -maxdepth 1 -mindepth 1 -type d | while read dir; do
+  echo "$dir"
+done
+
+find . -maxdepth 1 -type d -exec echo {} \;

linux-bash/loops/src/main/bash/loop_directories.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+for dir in */; do
+    echo "$dir"
+done
+
+for file in *; do
+    if [ -d "$file" ]; then
+        echo "$file"
+    fi
+done