diff --git a/force_merge_fil.txt b/force_merge_fil.txt deleted file mode 100644 index bc8ac10bf..000000000 --- a/force_merge_fil.txt +++ /dev/null @@ -1 +0,0 @@ -fil for å fremtvinge diff, for å se om git sier seg enig i at master og featurebranch er forskjellige