<commit_before><<<<<<< HEAD:app/views/admin/shared/_report_criteria.html.erb
<% content_for :head do %>
  <%= unobtrusive_datepicker_includes %>
<% end %>
=======
<% form_for [:admin, @search], :url => "" do |f| %> 
	<% f.fields_for @search.conditions do |s| %>
>>>>>>> Removed a lot of Prototype-traces.:app/views/admin/shared/_report_criteria.html.erb

<<<<<<< HEAD:app/views/admin/shared/_report_criteria.html.erb
<% form_for @search do |f| %> 
=======
>>>>>>> Removed a lot of Prototype-traces.:app/views/admin/shared/_report_criteria.html.erb
    <label><%= t("date_range") %></label><br />
    <div class="yui-g date-range-filter">
      <div class="yui-u sub-field first">
<<<<<<< HEAD:app/views/admin/shared/_report_criteria.html.erb
        <%= f.calendar_date_select :created_at_after %><br />
=======
        <%= s.unobtrusive_date_picker :created_at_after %><br />
>>>>>>> Remove calendar_date_select, add unobtrusive_date_picker instead it.:app/views/admin/shared/_report_criteria.html.erb
        <label class="sub"><%= t("start") %></label>
      </div>
      <div class="yui-u sub-field">
<<<<<<< HEAD:app/views/admin/shared/_report_criteria.html.erb
        <%= f.calendar_date_select :created_at_before %><br />
=======
        <%= s.unobtrusive_date_picker :created_at_before %><br />
>>>>>>> Remove calendar_date_select, add unobtrusive_date_picker instead it.:app/views/admin/shared/_report_criteria.html.erb
        <label><%= t("stop") %></label>
      </div>
    </div>

		<p><%= button t("search") %></p>
<% end %>	<commit_msg>Fixed an accidental merge conflict that was committed.<commit_after><% form_for @search do |f| %> 
	<% f.fields_for @search.conditions do |s| %>

    <label><%= t("date_range") %></label><br />
    <div class="yui-g date-range-filter">
      <div class="yui-u sub-field first">
        <%= s.unobtrusive_date_picker :created_at_after %><br />
        <label class="sub"><%= t("start") %></label>
      </div>
      <div class="yui-u sub-field">
        <%= s.unobtrusive_date_picker :created_at_before %><br />
        <label><%= t("stop") %></label>
      </div>
    </div>

		<p><%= button t("search") %></p>
<% end %>
{'fraction_non_alphanumeric': 0.21731123388581952, 'fraction_numerical': 0.0, 'mean_word_length': 3.828888888888889, 'pattern_counts': {'":': 0, '<': 91, '<?xml version=': 0, '>': 92, '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': '5004683', 'n_tokens_mistral': 817, 'n_tokens_neox': 766, 'n_words': 136}