<commit_before>--- index.html	2015-09-25 10:52:24.641260977 +0100
+++ index2.html	2015-09-25 10:53:01.997260869 +0100
@@ -114,70 +114,8 @@
 <!-- Saiku Project -->
 <script type="text/javascript" src="js/saiku/Settings.js"></script>
 
-<script type="text/javascript" src="js/saiku/models/SaikuOlapQuery.js"></script>
-<script type="text/javascript" src="js/saiku/models/DateFilter.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuTableRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuChartRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/models/Dimension.js"></script>
-<script type="text/javascript" src="js/saiku/views/DimensionList.js"></script>
-<script type="text/javascript" src="js/saiku/views/Toolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/Upgrade.js"></script>
-<script type="text/javascript" src="js/saiku/views/Modal.js"></script>
-<script type="text/javascript" src="js/saiku/views/MDXModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/SelectionsModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DrillthroughModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DrillAcrossModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/PermissionsModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DemoLoginForm.js"></script>
-<script type="text/javascript" src="js/saiku/views/LoginForm.js"></script>
-<script type="text/javascript" src="js/saiku/views/AboutModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/OverwriteModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/AddFolderModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/FilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/CustomFilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/MeasuresModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/CalculatedMemberModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DataSourcesModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/QueryToolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/WorkspaceToolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/WorkspaceDropZone.js"></script>
-<script type="text/javascript" src="js/saiku/views/Table.js"></script>
-<script type="text/javascript" src="js/saiku/views/Workspace.js"></script>
-<script type="text/javascript" src="js/saiku/views/DeleteRepositoryObject.js"></script>
-<script type="text/javascript" src="js/saiku/views/MoveRepositoryObject.js"></script>
-<script type="text/javascript" src="js/saiku/views/OpenQuery.js"></script>
-<script type="text/javascript" src="js/saiku/views/SaveQuery.js"></script>
-<script type="text/javascript" src="js/saiku/views/OpenDialog.js"></script>
-<script type="text/javascript" src="js/saiku/views/TabSet.js"></script>
-<script type="text/javascript" src="js/saiku/views/Tab.js"></script>
-<script type="text/javascript" src="js/saiku/models/Repository.js"></script>
-<script type="text/javascript" src="js/saiku/models/Result.js"></script>
-<script type="text/javascript" src="js/saiku/models/QueryAction.js"></script>
-<script type="text/javascript" src="js/saiku/models/QueryScenario.js"></script>
-<script type="text/javascript" src="js/saiku/models/Query.js"></script>
-<script type="text/javascript" src="js/saiku/views/SessionErrorModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/WarningModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/TitlesModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/GrowthModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/FormatAsPercentageModal.js"></script>
-<script type="text/javascript" src="js/saiku/models/Session.js"></script>
-<script type="text/javascript" src="js/saiku/views/SplashScreen.js"></script>
-<script type="text/javascript" src="js/saiku/models/SessionWorkspace.js"></script>
-<script type="text/javascript" src="js/saiku/models/Member.js"></script>
-<script type="text/javascript" src="js/saiku/models/Plugin.js"></script>
-<script type="text/javascript" src="js/saiku/models/Settings.js"></script>
-<script type="text/javascript" src="js/saiku/models/License.js"></script>
-<script type="text/javascript" src="js/saiku/Saiku.js"></script>
-<script type="text/javascript" src="js/saiku/views/DateFilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/adapters/SaikuServer.js"></script>
-<script type="text/javascript" src="js/saiku/routers/QueryRouter.js"></script>
-
 <!-- Saiku Minified - remove all of the above and uncomment the following -->
-<!--
 <script type="text/javascript" src="saiku.min.js"></script>
--->

 <!--
 <script src="js/leaflet/leaflet-heat.js"></script>
<commit_msg>fix merge<commit_after>--- index.html	2015-10-05 15:10:29.264964752 +0100
+++ index2.html	2015-10-05 15:18:48.336972521 +0100
@@ -114,69 +114,9 @@
 <!-- Saiku Project -->
 <script type="text/javascript" src="js/saiku/Settings.js"></script>
 
-<script type="text/javascript" src="js/saiku/models/SaikuOlapQuery.js"></script>
-<script type="text/javascript" src="js/saiku/models/DateFilter.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuTableRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/render/SaikuChartRenderer.js"></script>
-<script type="text/javascript" src="js/saiku/models/Dimension.js"></script>
-<script type="text/javascript" src="js/saiku/views/DimensionList.js"></script>
-<script type="text/javascript" src="js/saiku/views/Toolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/Upgrade.js"></script>
-<script type="text/javascript" src="js/saiku/views/Modal.js"></script>
-<script type="text/javascript" src="js/saiku/views/MDXModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/SelectionsModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DrillthroughModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DrillAcrossModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/PermissionsModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DemoLoginForm.js"></script>
-<script type="text/javascript" src="js/saiku/views/LoginForm.js"></script>
-<script type="text/javascript" src="js/saiku/views/AboutModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/OverwriteModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/AddFolderModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/FilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/CustomFilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/MeasuresModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/CalculatedMemberModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/DataSourcesModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/QueryToolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/WorkspaceToolbar.js"></script>
-<script type="text/javascript" src="js/saiku/views/WorkspaceDropZone.js"></script>
-<script type="text/javascript" src="js/saiku/views/Table.js"></script>
-<script type="text/javascript" src="js/saiku/views/Workspace.js"></script>
-<script type="text/javascript" src="js/saiku/views/DeleteRepositoryObject.js"></script>
-<script type="text/javascript" src="js/saiku/views/MoveRepositoryObject.js"></script>
-<script type="text/javascript" src="js/saiku/views/OpenQuery.js"></script>
-<script type="text/javascript" src="js/saiku/views/SaveQuery.js"></script>
-<script type="text/javascript" src="js/saiku/views/OpenDialog.js"></script>
-<script type="text/javascript" src="js/saiku/views/TabSet.js"></script>
-<script type="text/javascript" src="js/saiku/views/Tab.js"></script>
-<script type="text/javascript" src="js/saiku/models/Repository.js"></script>
-<script type="text/javascript" src="js/saiku/models/Result.js"></script>
-<script type="text/javascript" src="js/saiku/models/QueryAction.js"></script>
-<script type="text/javascript" src="js/saiku/models/QueryScenario.js"></script>
-<script type="text/javascript" src="js/saiku/models/Query.js"></script>
-<script type="text/javascript" src="js/saiku/views/SessionErrorModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/WarningModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/TitlesModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/GrowthModal.js"></script>
-<script type="text/javascript" src="js/saiku/views/FormatAsPercentageModal.js"></script>
-<script type="text/javascript" src="js/saiku/models/Session.js"></script>
-<script type="text/javascript" src="js/saiku/views/SplashScreen.js"></script>
-<script type="text/javascript" src="js/saiku/models/SessionWorkspace.js"></script>
-<script type="text/javascript" src="js/saiku/models/Member.js"></script>
-<script type="text/javascript" src="js/saiku/models/Plugin.js"></script>
-<script type="text/javascript" src="js/saiku/models/Settings.js"></script>
-<script type="text/javascript" src="js/saiku/models/License.js"></script>
-<script type="text/javascript" src="js/saiku/Saiku.js"></script>
-<script type="text/javascript" src="js/saiku/views/DateFilterModal.js"></script>
-<script type="text/javascript" src="js/saiku/adapters/SaikuServer.js"></script>
-<script type="text/javascript" src="js/saiku/routers/QueryRouter.js"></script>
-
 <!-- Saiku Minified - remove all of the above and uncomment the following -->
-<!--
 <script type="text/javascript" src="saiku.min.js"></script>
--->
+
 
 <!--
 <script src="js/leaflet/leaflet-heat.js"></script>
{'fraction_non_alphanumeric': 0.21540444091990485, 'fraction_numerical': 0.012688342585249802, 'mean_word_length': 6.445756457564576, 'pattern_counts': {'":': 0, '<': 255, '<?xml version=': 0, '>': 253, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2675100', 'n_tokens_mistral': 3490, 'n_tokens_neox': 3410, 'n_words': 413}