Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use UTF-8 instead of ISO-LATIN-1. #757

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Use UTF-8 instead of ISO-LATIN-1. #757

merged 1 commit into from
Sep 6, 2024

Conversation

atgeirr
Copy link
Member

@atgeirr atgeirr commented Sep 6, 2024

Fixes a compile warning for me. Github shows both as equal, but in the terminal I see this:

diff --git a/tests/cpgrid/entityrep_test.cpp b/tests/cpgrid/entityrep_test.cpp
index 21b3056c..0a3794b3 100644
--- a/tests/cpgrid/entityrep_test.cpp
+++ b/tests/cpgrid/entityrep_test.cpp
@@ -5,7 +5,7 @@
 // Created: Wed Aug 26 11:15:48 2009
 //
 // Author(s): Atgeirr F Rasmussen <[email protected]>
-//            B<E5>rd Skaflestad     <[email protected]>
+//            Bård Skaflestad     <[email protected]>
 //
 // $Date$
 //
diff --git a/tests/cpgrid/orientedentitytable_test.cpp b/tests/cpgrid/orientedentitytable_test.cpp
index 2393dfcb..88ee002a 100644
--- a/tests/cpgrid/orientedentitytable_test.cpp
+++ b/tests/cpgrid/orientedentitytable_test.cpp
@@ -5,7 +5,7 @@
 // Created: Wed Aug 26 11:17:20 2009
 //
 // Author(s): Atgeirr F Rasmussen <[email protected]>
-//            B<E5>rd Skaflestad     <[email protected]>
+//            Bård Skaflestad     <[email protected]>
 //
 // $Date$
 //

Note the "Brd" in the master branch.

@atgeirr
Copy link
Member Author

atgeirr commented Sep 6, 2024

jenkins build this please

Copy link
Member

@bska bska left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this makes sense. I'll merge into master.

@bska bska merged commit e348baa into OPM:master Sep 6, 2024
1 check passed
@blattms
Copy link
Member

blattms commented Sep 6, 2024

I blame my incompetency with using meld with git mergetool here. Sorry! 😅

@atgeirr atgeirr deleted the use-utf8 branch September 9, 2024 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants