Skip to content

Commit

Permalink
Removed all conflicting files.
Browse files Browse the repository at this point in the history 
I used the following Git commands:

$ git merge-base master pr/6558-french-translation-updates-prepare-menu-up-to-view-labels-levels
$ git checkout b291378 -- dlgBarAndPieChart.Designer.vb dlgBarAndPieChart.resx dlgBoxPlot.designer.vb dlgCircular.Designer.vb dlgColumnStats.Designer.vb dlgColumnStats.resx dlgHistogram.designer.vb dlgHistogram.resx dlgHistogram.vb dlgMerge.resx dlgOneVariableGraph.resx dlgOneWayFrequencies.resx dlgOptions.resx dlgRandomSample.resx dlgRestrict.resx dlgSummaryTables.Designer.vb dlgSummaryTables.resx sdgCorrPlot.resx sdgMissingOptions.Designer.vb sdgPlots.resx
  • Loading branch information
@lloyddewit
lloyddewit committed Aug 5, 2021
1 parent b3d4bef commit 5a4a5b8
Show file tree
Hide file tree
Showing 20 changed files with 2,055 additions and 1,961 deletions.
80 changes: 40 additions & 40 deletions instat/dlgBarAndPieChart.Designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5a4a5b8

Please sign in to comment.