From 847b61d1f9db6bc9e01e01ad6519fb5c6d8b7e96 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 22 Jul 2021 14:53:15 +0200
Subject: [PATCH] GIT: fix some merge and edit rubbish
---
.../meshObjects/gravity/gravityMeshObject.C | 2 +-
.../syncObjects/syncObjectsTemplates.C | 33 -------------------
.../gasMixing/injectorPipe/Allclean | 2 +-
3 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 src/functionObjects/utilities/syncObjects/syncObjectsTemplates.C
diff --git a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
index d9dc3bccc8e..bf0d89442b3 100644
--- a/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
+++ b/src/finiteVolume/cfdTools/general/meshObjects/gravity/gravityMeshObject.C
@@ -21,7 +21,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
- alongravityMeshObject with OpenFOAM. If not, see <http://www.gravityMeshObjectnu.orgravityMeshObject/licenses/>.
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
diff --git a/src/functionObjects/utilities/syncObjects/syncObjectsTemplates.C b/src/functionObjects/utilities/syncObjects/syncObjectsTemplates.C
deleted file mode 100644
index 05dc827a17c..00000000000
--- a/src/functionObjects/utilities/syncObjects/syncObjectsTemplates.C
+++ /dev/null
@@ -1,33 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | www.openfoam.com
- \\/ M anipulation |
--------------------------------------------------------------------------------
- Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "objectRegistry.H"
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean
index eaea453be65..bf3b4862be7 100755
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean
@@ -6,6 +6,6 @@ cd "${0%/*}" || exit # Run from this directory
cleanCase0
rm -rf constant/extendedFeatureEdgeMesh
-rm -f constant/triSurface
+rm -rf constant/triSurface
#------------------------------------------------------------------------------
--
GitLab