Merge branch 'master' of https://bitbucket.org/binh-aim/translucentwp # Conflicts: # wp-config.php # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch master # Your branch and 'origin/master' have diverged, # and have 1 and 2 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) # # All conflicts fixed but you are still merging. # # Changes to be committed: # new file: wp-config.php # modified: wp-content/themes/translucent/css/kubernetes.css # modified: wp-content/themes/translucent/css/marchine.css # modified: wp-content/themes/translucent/kubernetes-professional-services-new.php # modified: wp-content/themes/translucent/machine-learning-new.php # new file: wp-content/uploads/2022/09/24-7_2-1-150x150.png # new file: wp-content/uploads/2022/09/24-7_2-1-150x150.png.webp # new file: wp-content/uploads/2022/09/24-7_2-1.png # new file: wp-content/uploads/2022/09/24-7_2-1.png.webp # new file: wp-content/uploads/2022/09/Group-8841-150x59.png # new file: wp-content/uploads/2022/09/Group-8841-150x59.png.webp # new file: wp-content/uploads/2022/09/Group-8841.png # new file: wp-content/uploads/2022/09/Group-8841.png.webp # new file: wp-content/uploads/2022/09/hand_tools-150x150.png # new file: wp-content/uploads/2022/09/hand_tools-150x150.png.webp # new file: wp-content/uploads/2022/09/hand_tools.png # new file: wp-content/uploads/2022/09/hand_tools.png.webp # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1-150x150.png # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1-150x150.png.webp # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1-300x241.png # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1-300x241.png.webp # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1.png # new file: wp-content/uploads/2022/09/kubernetes_and_conteiners_2-1.png.webp # new file: wp-content/uploads/2022/09/kubernetes_certified_icon-1.png # new file: wp-content/uploads/2022/09/kubernetes_certified_icon-1.png.webp # new file: wp-content/uploads/2022/09/learn_informa_plan-1-150x96.png # new file: wp-content/uploads/2022/09/learn_informa_plan-1-150x96.png.webp # new file: wp-content/uploads/2022/09/learn_informa_plan-1-300x84.png # new file: wp-content/uploads/2022/09/learn_informa_plan-1-300x84.png.webp # new file: wp-content/uploads/2022/09/learn_informa_plan-1.png # new file: wp-content/uploads/2022/09/learn_informa_plan-1.png.webp # new file: wp-content/uploads/2022/09/machine_learning-150x150.png # new file: wp-content/uploads/2022/09/machine_learning-150x150.png.webp # new file: wp-content/uploads/2022/09/machine_learning-300x251.png # new file: wp-content/uploads/2022/09/machine_learning-300x251.png.webp # new file: wp-content/uploads/2022/09/machine_learning.png # new file: wp-content/uploads/2022/09/machine_learning.png.webp #